diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 99bd06eca62f..d7edfd6e4597 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	tkman
-# Version required:     2.0b7
+# Version required:     2.0
 # Date created:         27 Dec 1994
 # Whom:                 Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.24 1997/06/17 06:05:50 tg Exp $
+# $Id: Makefile,v 1.25 1997/08/25 09:46:30 tg Exp $
 #
 
-DISTNAME=	tkman-2.0b7
+DISTNAME=	tkman-2.0
 CATEGORIES=	misc tk80
 MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
 EXTRACT_SUFX=	.tar.Z
diff --git a/misc/tkman/distinfo b/misc/tkman/distinfo
index a52523337244..a7ab5723d565 100644
--- a/misc/tkman/distinfo
+++ b/misc/tkman/distinfo
@@ -1 +1 @@
-MD5 (tkman-2.0b7.tar.Z) = 4658e6957d623e4576dc8e69a133b5d9
+MD5 (tkman-2.0.tar.Z) = 735fdb661a876e40ecec60308a98f522
diff --git a/misc/tkman/files/patch-aa b/misc/tkman/files/patch-aa
index 9dc241cf0dff..811f3b7072ef 100644
--- a/misc/tkman/files/patch-aa
+++ b/misc/tkman/files/patch-aa
@@ -1,25 +1,25 @@
---- Makefile.orig	Sat Aug 23 02:55:32 1997
-+++ Makefile	Mon Aug 25 11:06:34 1997
-@@ -38,13 +38,13 @@
+--- Makefile.orig	Thu Sep 18 01:33:17 1997
++++ Makefile	Thu Sep 18 08:54:12 1997
+@@ -39,13 +39,13 @@
  ### you need to localize the paths on these lines
  
  #WISH = /usr/sww/tcl-8.0/bin/wish
--WISH = /home/orodruin/h/bair/phelps/bin/sun4/wish
+-WISH = /private/share/bin/wish
 -#WISH = /usr/local/bin/wish8.0
-+#WISH = /home/orodruin/h/bair/phelps/bin/sun4/wish
++#WISH = /private/share/bin/wish
 +WISH = ${PREFIX}/bin/wish8.0
  
  # the executable `tkman' is placed in BINDIR
  # this should be a directory that's in your bin PATH
--BINDIR = /home/orodruin/h/bair/phelps/bin
+-BINDIR = /private/share/bin
 -#BINDIR = /usr/local/bin
-+#BINDIR = /home/orodruin/h/bair/phelps/bin
++#BINDIR = /private/share/bin
 +BINDIR = ${PREFIX}/bin
  
  
  # OPTIONAL
-@@ -53,9 +53,9 @@
- # (Follow pattern in sample "dir.tkman".)
+@@ -55,9 +55,9 @@
+ # This directory should not have any Texinfo source itself.
  # More information is given in tkman-help.html
  # if you don't have Texinfo files, leave this variable empty
 -texinfodir = ""
@@ -30,7 +30,7 @@
  
  
  # OPTIONAL
-@@ -79,10 +79,12 @@
+@@ -81,10 +81,12 @@
  # will examine for matches if a search in the usual locations fails while searching
  # for a man pages and displaying its associated binaries (if any).
  # Use this feature carefully as a large number of directories can slow down startup.
@@ -45,7 +45,7 @@
  
  
  # names of common printers, in addition to default printer (PRINTER or LPDEST)
-@@ -99,13 +101,13 @@
+@@ -101,13 +103,13 @@
  # but seems to kill international characters, such as u-with-umlaut
  #manformat = {tbl | neqn | nroff -man | col }
  # ALTERNATIVES
@@ -61,7 +61,7 @@
  # Ultrix users should uncomment the following line (you don't have eqn)
  #manformat = {tbl | nroff -man }
  # BSDI
-@@ -151,7 +153,7 @@
+@@ -153,7 +155,7 @@
  
  
  # pick a printing pipeline for which your platform has all the constituants
@@ -70,7 +70,7 @@
  # alternatives
  #manprint = {tbl | eqn | troff -man -t | lpr -t}
  #manprint = {tbl | eqn | psroff -man}
-@@ -175,7 +177,7 @@
+@@ -177,7 +179,7 @@
  # so how can you lose?
  
  # BY DEFAULT ON (Boolean scope set to entire file)
@@ -79,7 +79,7 @@
  # IF YOU DON'T WANT TO BOTHER WITH GLIMPSE, you can disable it here
  #glimpse = ""
  # give the full path, if you'd like
-@@ -183,6 +185,7 @@
+@@ -185,6 +187,7 @@
  # variations (refer to the Glimpse manual page)
  # no characters treated as meta characters:
  #glimpse = "glimpse -Wk"
@@ -87,7 +87,7 @@
  
  # glimpseindex indexes the manual pages, for each component of one's MANPATH,
  # and places the results in a set of files named .glimpse_* in that MANPATH
-@@ -224,7 +227,7 @@
+@@ -226,7 +229,7 @@
  # default MANPATH to use if user doesn't have a MANPATH environment variable set.
  # Leave this empty to have TkMan calculate a MANPATH based on a users PATH
  # (like Perl man does).
@@ -96,7 +96,7 @@
  #manpathdef = /usr/man:/usr/local/man
  #manpathdef = /usr/man:/usr/local/man:/usr/sww/man:/usr/sww/X11/man
  # for SGI
-@@ -395,8 +398,8 @@
+@@ -397,8 +400,8 @@
  	chmod +rx $(BINDIR)/tkman
  	$(CP) retkman $(BINDIR)
  	chmod +rx $(BINDIR)/retkman
diff --git a/misc/tkman/files/patch-ab b/misc/tkman/files/patch-ab
deleted file mode 100644
index 30cfabbb66fc..000000000000
--- a/misc/tkman/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- tkman.tcl.orig	Sat Aug 23 02:55:32 1997
-+++ tkman.tcl	Mon Aug 25 11:39:03 1997
-@@ -2410,7 +2410,7 @@
- 			set man(glimpse) $default(glimpse)
- 			set man(glimpseindex) $default(glimpseindex)
- 			# likewise, reset manformat so assured of picking up long lines
--			set man(manformat) $default(manformat)
-+			set man(format) $default(format)
- 
- 			set fixup 1
- 		}