diff --git a/Makefile b/Makefile
index c4dea6c394..45709281a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5052 2013/01/07 03:30:31 othyro Exp $
+# $Id: Makefile,v 1.5053 2013/01/07 13:30:24 thomasklausner Exp $
 #
 
 COMMENT=	WIP pkgsrc packages
@@ -3061,7 +3061,6 @@ SUBDIR+=	tcc-devel
 SUBDIR+=	tcl-curl
 SUBDIR+=	tcl-iwidgets
 SUBDIR+=	tcl-tclOO
-SUBDIR+=	tcl85-itcl
 SUBDIR+=	tcl86
 SUBDIR+=	tcmplex-panteltje
 SUBDIR+=	tcpspy
diff --git a/TODO b/TODO
index a9041d2148..8dffffcf40 100644
--- a/TODO
+++ b/TODO
@@ -231,7 +231,6 @@ Suggested ready to import packages
 	o saxon
 	o send-pr
 	o tcl-tclOO
-	o tcl85-itcl
 	o tktable
 	o tqsllib
 	o truecrypt
diff --git a/tcl-iwidgets/Makefile b/tcl-iwidgets/Makefile
index 223e77f16a..4fbd942dc7 100644
--- a/tcl-iwidgets/Makefile
+++ b/tcl-iwidgets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/31 20:11:18 othyro Exp $
+# $NetBSD: Makefile,v 1.4 2013/01/07 13:30:24 thomasklausner Exp $
 #
 
 DISTNAME=	iwidgets-4.0.1
@@ -40,5 +40,5 @@ do-install:
 	${INSTALL_MAN} doc/collapsablewidget.n ${DESTDIR}${PREFIX}/${PKGMANDIR}/mann/ && \
 	${INSTALL_DATA} src/* ${DESTDIR}${PREFIX}/lib/iwidgets/incoming/
 
-.include "../../wip/tcl85-itcl/buildlink3.mk"
+.include "../../lang/tcl-itcl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/tcl-iwidgets/buildlink3.mk b/tcl-iwidgets/buildlink3.mk
index 66f14994c6..492acb2ddd 100644
--- a/tcl-iwidgets/buildlink3.mk
+++ b/tcl-iwidgets/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2012/09/29 02:59:47 othyro Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2013/01/07 13:30:24 thomasklausner Exp $
 
 BUILDLINK_TREE+=	tcl-iwidgets
 
@@ -10,7 +10,7 @@ BUILDLINK_DEPMETHOD.tcl-iwidgets?=	build
 BUILDLINK_API_DEPENDS.tcl-iwidgets+=	tcl-iwidgets>=4.0.1
 BUILDLINK_PKGSRCDIR.tcl-iwidgets?=	../../wip/tcl-iwidgets
 
-#.include "../../wip/tcl85-itcl/buildlink3.mk"
+#.include "../../lang/tcl-itcl/buildlink3.mk"
 .endif	# TCL_IWIDGETS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-tcl-iwidgets
diff --git a/tcl85-itcl/DESCR b/tcl85-itcl/DESCR
deleted file mode 100644
index 7f509b16ee..0000000000
--- a/tcl85-itcl/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-[incr Tcl] is the most widely used O-O system for Tcl. The name is a play on
-C++, and [incr Tcl] provides a similar object model, including multiple
-inheritence and public and private classes and variables.
diff --git a/tcl85-itcl/Makefile b/tcl85-itcl/Makefile
deleted file mode 100644
index c8745e3f42..0000000000
--- a/tcl85-itcl/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2012/12/30 03:08:45 othyro Exp $
-#
-
-DISTNAME=	itcl3.4.1
-PKGNAME=	${DISTNAME:S/itcl/tcl85-itcl-/}
-PKGREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=incrtcl/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://incrtcl.sourceforge.net/
-COMMENT=	O-O system for Tcl
-LICENSE=	2-clause-bsd # ?
-
-GNU_CONFIGURE=	yes
-
-.include "../../x11/tk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/tcl85-itcl/PLIST b/tcl85-itcl/PLIST
deleted file mode 100644
index dc0052d413..0000000000
--- a/tcl85-itcl/PLIST
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2012/12/30 03:08:45 othyro Exp $
-include/itcl.h
-include/itclDecls.h
-include/itclInt.h
-include/itclIntDecls.h
-lib/itcl3.4/itcl.tcl
-lib/itcl3.4/libitcl3.4.so
-lib/itcl3.4/libitclstub3.4.a
-lib/itcl3.4/pkgIndex.tcl
-lib/itclConfig.sh
-man/mann/body.n
-man/mann/class.n
-man/mann/code.n
-man/mann/configbody.n
-man/mann/delete.n
-man/mann/ensemble.n
-man/mann/find.n
-man/mann/is.n
-man/mann/itcl.n
-man/mann/itclvars.n
-man/mann/local.n
-man/mann/scope.n
diff --git a/tcl85-itcl/buildlink3.mk b/tcl85-itcl/buildlink3.mk
deleted file mode 100644
index 643ec9aca0..0000000000
--- a/tcl85-itcl/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/10/22 21:34:57 othyro Exp $
-
-BUILDLINK_TREE+=	tcl85-itcl
-
-.if !defined(TCL85_ITCL_BUILDLINK3_MK)
-TCL85_ITCL_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.tcl85-itcl+=	tcl85-itcl>=3.4.1
-BUILDLINK_PKGSRCDIR.tcl85-itcl?=	../../wip/tcl85-itcl
-
-.include "../../x11/tk/buildlink3.mk"
-.endif	# TCL85_ITCL_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-tcl85-itcl
diff --git a/tcl85-itcl/distinfo b/tcl85-itcl/distinfo
deleted file mode 100644
index 725d71b979..0000000000
--- a/tcl85-itcl/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2012/09/29 02:11:01 othyro Exp $
-
-SHA1 (itcl3.4.1.tar.gz) = b791374d8fe4c5b31d6f45793622499a9d08d3e1
-RMD160 (itcl3.4.1.tar.gz) = a3293d8e7beeee8cd308a7c56edf7c790a374ef4
-Size (itcl3.4.1.tar.gz) = 263316 bytes
diff --git a/tk85-itk/Makefile b/tk85-itk/Makefile
index 7308b1d15a..79ced7813e 100644
--- a/tk85-itk/Makefile
+++ b/tk85-itk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/10/31 22:39:46 othyro Exp $
+# $NetBSD: Makefile,v 1.7 2013/01/07 13:30:24 thomasklausner Exp $
 #
 
 DISTNAME=	itk3.3
@@ -19,7 +19,7 @@ USE_TOOLS+=		grep
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
-.include "../../wip/tcl85-itcl/buildlink3.mk"
+.include "../../lang/tcl-itcl/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/tk85-itk/buildlink3.mk b/tk85-itk/buildlink3.mk
index 2342797d3a..c4d5285613 100644
--- a/tk85-itk/buildlink3.mk
+++ b/tk85-itk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/10/14 13:30:45 thomasklausner Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2013/01/07 13:30:24 thomasklausner Exp $
 
 BUILDLINK_TREE+=	tk85-itk
 
@@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.tk85-itk?=	../../wip/tk85-itk
 
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../wip/tcl85-itcl/buildlink3.mk"
+.include "../../lang/tcl-itcl/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .endif	# TK85_ITK_BUILDLINK3_MK