diff --git a/x11/tktable/Makefile b/x11/tktable/Makefile
new file mode 100644
index 00000000000..9b230c77851
--- /dev/null
+++ b/x11/tktable/Makefile
@@ -0,0 +1,36 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2000/06/07 16:40:02 kevlo Exp $
+
+DISTNAME=	tkTable
+PKGNAME=	tkTable-2.5
+CATEGORIES=	x11
+NEED_VERSION=	1.234
+
+MAINTAINER=	kevlo@openbsd.org
+
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=	http://www.hobbs.wservice.com/tcl/capp/tkTable/
+
+BUILD_DEPENDS=	wish8.3::x11/tk/8.3
+
+WRKDIST=	${WRKDIR}/Tktable2.5/src
+
+USE_GMAKE=	Yes
+GNU_CONFIGURE=	Yes
+CONFIGURE_ARGS=--with-tcl=${PREFIX}/lib/tcl8.3 \
+		--with-tk=${PREFIX}/lib/tk8.3
+
+FAKE=		Yes
+
+do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/Tktable/demos
+	${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl ${PREFIX}/lib/Tktable
+	${INSTALL_DATA} ${WRKSRC}/../lib/tkTable.tcl ${PREFIX}/lib/Tktable
+	${INSTALL_MAN} ${WRKSRC}/../doc/tkTable.n ${PREFIX}/man/mann
+	${INSTALL_PROGRAM} ${WRKSRC}/Tktable.so.2.5 ${PREFIX}/lib/Tktable
+	@cp ${WRKSRC}/../demos/* ${PREFIX}/lib/Tktable/demos
+
+.include <bsd.port.mk>
diff --git a/x11/tktable/files/md5 b/x11/tktable/files/md5
new file mode 100644
index 00000000000..5a8a9fbfe71
--- /dev/null
+++ b/x11/tktable/files/md5
@@ -0,0 +1,3 @@
+MD5 (tkTable.tar.gz) = f053efb4e9b12103b4794235e24290c2
+RMD160 (tkTable.tar.gz) = a12d3421360d9e703d192d22dc6d11830e783eee
+SHA1 (tkTable.tar.gz) = 307940341b19a91361bc00889d2ca2435c7003ba
diff --git a/x11/tktable/patches/patch-aa b/x11/tktable/patches/patch-aa
new file mode 100644
index 00000000000..43d01c11289
--- /dev/null
+++ b/x11/tktable/patches/patch-aa
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	Tue Jun  1 23:31:36 1999
++++ Makefile.in	Wed Jun  7 16:14:56 2000
+@@ -82,7 +82,7 @@
+ 		  -I$(TCL_SRC_DIR)/generic\
+ 		  -I$(TK_SRC_DIR)/generic
+ 
+-DLL		= $(PACKAGE)$(SHLIB_SUFFIX)
++DLL		= $(PACKAGE)$(SHLIB_SUFFIX).$(TBL_VERSION)
+ STATIC_LIB	= $(PACKAGE).a
+ PACKAGEDIR	= $(PACKAGE)$(TBL_VERSION)
+ STATIC_EXEC	= tablewish
+@@ -126,7 +126,7 @@
+ 	echo 'if {[catch {package require Tcl $(TCL_VERSION)}]} return';\
+ 	echo 'package ifneeded $(PACKAGE) $(TBL_VERSION)\
+ 	    "package require Tk $(TK_VERSION);\
+-	     [list load [file join $$dir $(DLL).$(TBL_VERSION)] $(PACKAGE)]"'\
++	     [list load [file join $$dir $(DLL)] $(PACKAGE)]"'\
+ 	) > pkgIndex.tcl
+ 
+ install: all
diff --git a/x11/tktable/pkg/COMMENT b/x11/tktable/pkg/COMMENT
new file mode 100644
index 00000000000..a45f0069182
--- /dev/null
+++ b/x11/tktable/pkg/COMMENT
@@ -0,0 +1 @@
+tk extension
diff --git a/x11/tktable/pkg/DESCR b/x11/tktable/pkg/DESCR
new file mode 100644
index 00000000000..b31fb1d1f61
--- /dev/null
+++ b/x11/tktable/pkg/DESCR
@@ -0,0 +1,21 @@
+TkTable is a table/matrix widget extension to Tcl/Tk.
+The basic features of the widget are:
+
+ * multi-line cells
+ * support for embedded windows (one per cell)
+ * row & column spanning
+ * variable width columns / height rows (interactively resizable)
+ * row and column titles
+ * multiple data sources ((Tcl array || Tcl command) &| internal caching)
+ * supports standard Tk reliefs, fonts, colors, etc.
+ * x/y scrollbar support
+ * 'tag' styles per row, column or cell to change visual appearance
+ * in-cell editing - returns value back to data source
+ * support for disabled (read-only) tables or cells (via tags)
+ * multiple selection modes, with "active" cell
+ * multiple drawing modes to get optimal performance for larger tables
+ * optional 'flashes' when things update
+ * cell validation support
+ * Works everywhere Tk does (including Windows and Mac!)
+ * Unicode support (Tk8.1+)
+
diff --git a/x11/tktable/pkg/PLIST b/x11/tktable/pkg/PLIST
new file mode 100644
index 00000000000..5e3a3bfc713
--- /dev/null
+++ b/x11/tktable/pkg/PLIST
@@ -0,0 +1,17 @@
+lib/Tktable/pkgIndex.tcl
+lib/Tktable/tkTable.tcl
+lib/Tktable/Tktable.so.2.5
+lib/Tktable/demos/basic.tcl
+lib/Tktable/demos/buttons.tcl
+lib/Tktable/demos/command.tcl
+lib/Tktable/demos/debug.tcl
+lib/Tktable/demos/dynarows.tcl
+lib/Tktable/demos/loadtable.tcl
+lib/Tktable/demos/maxsize.tcl
+lib/Tktable/demos/spreadsheet.tcl
+lib/Tktable/demos/tcllogo.gif
+lib/Tktable/demos/valid.tcl
+@exec /sbin/ldconfig -m %B
+man/mann/tkTable.n
+@dirrm lib/Tktable/demos
+@dirrm lib/Tktable