diff --git a/x11/tktable/Makefile b/x11/tktable/Makefile
index e527ca744fc..ae9b148372a 100644
--- a/x11/tktable/Makefile
+++ b/x11/tktable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/05/06 04:41:27 lebel Exp $
+# $OpenBSD: Makefile,v 1.5 2001/05/30 01:56:04 kevlo Exp $
 
 COMMENT=	"tk extension"
 
@@ -6,9 +6,9 @@ DISTNAME=	Tktable2.6
 PKGNAME=	Tktable-2.6
 CATEGORIES=	x11
 NEED_VERSION=	1.402
-MASTER_SITES=   http://www.hobbs.wservice.com/tcl/capp/tkTable/
+MASTER_SITES= 	http://tcl.activestate.com/community/hobbs/tcl/capp/tkTable/
 
-HOMEPAGE=       http://www.hobbs.wservice.com/tcl/capp/main.html
+HOMEPAGE= 	http://tktable.sourceforge.net/
 
 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 
@@ -23,7 +23,7 @@ WRKDIST=	${WRKDIR}/${DISTNAME}/unix
 
 USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu dest
-CONFIGURE_ARGS=--with-tcl=${PREFIX}/lib/tcl8.3 \
+CONFIGURE_ARGS=	--with-tcl=${PREFIX}/lib/tcl8.3 \
 		--with-tk=${PREFIX}/lib/tk8.3
 
 post-install:
diff --git a/x11/tktable/patches/patch-Makefile.in b/x11/tktable/patches/patch-Makefile.in
new file mode 100644
index 00000000000..b1c541af0df
--- /dev/null
+++ b/x11/tktable/patches/patch-Makefile.in
@@ -0,0 +1,32 @@
+--- Makefile.in.orig	Thu Aug  3 00:01:32 2000
++++ Makefile.in	Tue May 29 17:36:43 2001
+@@ -48,9 +48,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@
+ 
+@@ -118,8 +115,8 @@
+ LIB_RUNTIME_DIR = @libdir@
+ 
+ INCLUDES	= -I@includedir@ $(TK_XINCLUDES)\
+-		  -I$(TCL_SRC_DIR)/generic\
+-		  -I$(TK_SRC_DIR)/generic
++		  -I$(TCL_PREFIX)/include/tcl$(TCL_VERSION)/generic\
++		  -I$(TCL_PREFIX)/include/tk$(TK_VERSION)/generic
+ 
+ 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/patches/patch-aa b/x11/tktable/patches/patch-aa
deleted file mode 100644
index dec22fd2f4d..00000000000
--- a/x11/tktable/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Aug 26 04:02:43 2000
-+++ Makefile.in	Sat Aug 26 04:03:43 2000
-@@ -144,7 +144,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.