diff --git a/x11/tktable/Makefile b/x11/tktable/Makefile
index 58b6775f513..d18347a8a9b 100644
--- a/x11/tktable/Makefile
+++ b/x11/tktable/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2001/07/09 17:11:23 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.7 2001/08/11 16:04:45 kevlo Exp $
 
 COMMENT=	"tk extension"
 
-DISTNAME=	Tktable2.6
-PKGNAME=	Tktable-2.6
+DISTNAME=	Tktable2.7
+PKGNAME=	Tktable-2.7
 CATEGORIES=	x11
 NEED_VERSION=	1.402
-MASTER_SITES= 	http://tcl.activestate.com/community/hobbs/tcl/capp/tkTable/
 
 HOMEPAGE= 	http://tktable.sourceforge.net/
 
@@ -17,6 +16,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} 
+MASTER_SITE_SUBDIR=	tktable
+
 BUILD_DEPENDS=	wish8.3::x11/tk/8.3
 
 WRKDIST=	${WRKDIR}/${DISTNAME}/unix
@@ -28,7 +30,9 @@ CONFIGURE_ARGS=	--with-tcl=${PREFIX}/lib/tcl8.3 \
 		--with-tk=${PREFIX}/lib/tk8.3
 
 post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Tktable
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/Tktable
+	${INSTALL_DATA} ${WRKSRC}/../doc/tkTable.html ${PREFIX}/share/doc/Tktable
 	@cp ${WRKSRC}/../demos/* ${PREFIX}/share/examples/Tktable
 
 .include <bsd.port.mk>
diff --git a/x11/tktable/files/md5 b/x11/tktable/files/md5
index dced23ea108..bf92241229f 100644
--- a/x11/tktable/files/md5
+++ b/x11/tktable/files/md5
@@ -1,3 +1,3 @@
-MD5 (Tktable2.6.tar.gz) = c211ba3782d2914dbbe6f9023c293293
-RMD160 (Tktable2.6.tar.gz) = 6122858f104c9eae285209f962db9ef8dd41b725
-SHA1 (Tktable2.6.tar.gz) = c4ec6c9c7ea4549340039a576ff7c29a572a4020
+MD5 (Tktable2.7.tar.gz) = 1f6ef046f21b5195fa3f2ad4321668d7
+RMD160 (Tktable2.7.tar.gz) = cb7feba71f41c54389fb4b9072d97ff954dab974
+SHA1 (Tktable2.7.tar.gz) = 05745f4c2b3f6b324c58bc046dd3e3fea8aee26f
diff --git a/x11/tktable/patches/patch-Makefile.in b/x11/tktable/patches/patch-Makefile.in
index b1c541af0df..5fe2e26ae89 100644
--- a/x11/tktable/patches/patch-Makefile.in
+++ b/x11/tktable/patches/patch-Makefile.in
@@ -1,15 +1,15 @@
---- Makefile.in.orig	Thu Aug  3 00:01:32 2000
-+++ Makefile.in	Tue May 29 17:36:43 2001
-@@ -48,9 +48,6 @@
+--- Makefile.in.orig	Sat Aug 11 18:04:47 2001
++++ Makefile.in	Sat Aug 11 18:06:27 2001
+@@ -52,9 +52,6 @@
  TK_VERSION	= @TK_VERSION@
  WISH		= wish$(TK_VERSION)
  
 -TCL_SRC_DIR 	= @TCL_SRC_DIR@
 -TK_SRC_DIR 	= @TK_SRC_DIR@
 -
- TCL_LIB_SPEC	= @TCL_LIB_SPEC@
- TK_LIB_SPEC	= @TK_LIB_SPEC@
- 
+ TK_LIB_SPEC		= @TK_LIB_SPEC@
+ TK_STUB_LIB_SPEC	= @TK_STUB_LIB_SPEC@
+ TK_LIBS			= @TK_LIBS@
 @@ -118,8 +115,8 @@
  LIB_RUNTIME_DIR = @libdir@
  
@@ -21,12 +21,3 @@
  
  DLL		= $(PACKAGE)$(SHLIB_SUFFIX)
  STATIC_LIB	= $(PACKAGE).a
-@@ -144,7 +141,7 @@
- all: $(DLL) pkgIndex.tcl
- 
- $(DLL): $(OBJS)
--	$(SHLIB_LD) -o $@ $(OBJS) $(SHLIB_CFLAGS) $(SHLIB_LD_LIBS)
-+	$(SHLIB_LD) -o $@ $(OBJS) $(SHLIB_LD_LIBS)
- 
- # The megawish builds may not work anymore - I don't use anything but
- # extensions nowadays.
diff --git a/x11/tktable/pkg/PFRAG.shared b/x11/tktable/pkg/PFRAG.shared
index 3e244986232..3f5af3af9d8 100644
--- a/x11/tktable/pkg/PFRAG.shared
+++ b/x11/tktable/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1 2000/08/26 14:18:24 kevlo Exp $
-lib/Tktable2.6/Tktable.so.2.6
+@comment $OpenBSD: PFRAG.shared,v 1.2 2001/08/11 16:04:50 kevlo Exp $
+lib/Tktable2.7/Tktable.so.2.7
 NEWDYNLIBDIR(%B)
diff --git a/x11/tktable/pkg/PLIST b/x11/tktable/pkg/PLIST
index db95f1fd1d9..9608f91c87a 100644
--- a/x11/tktable/pkg/PLIST
+++ b/x11/tktable/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/08/26 14:18:24 kevlo Exp $
-lib/Tktable2.6/pkgIndex.tcl
-lib/Tktable2.6/tkTable.tcl
+@comment $OpenBSD: PLIST,v 1.3 2001/08/11 16:04:50 kevlo Exp $
+lib/Tktable2.7/pkgIndex.tcl
+lib/Tktable2.7/tkTable.tcl
 man/mann/tkTable.n
+share/doc/Tktable/tkTable.html
 share/examples/Tktable/basic.tcl
 share/examples/Tktable/buttons.tcl
 share/examples/Tktable/command.tcl
@@ -14,4 +15,5 @@ share/examples/Tktable/tcllogo.gif
 share/examples/Tktable/valid.tcl
 %%SHARED%%
 @dirrm share/examples/Tktable
-@dirrm lib/Tktable2.6
+@dirrm share/doc/Tktable
+@dirrm lib/Tktable2.7