diff --git a/dev-lang/tcl/tcl-8.5.9.recipe b/dev-lang/tcl/tcl-8.5.9.recipe
index 9e424aa9b..442503cd5 100644
--- a/dev-lang/tcl/tcl-8.5.9.recipe
+++ b/dev-lang/tcl/tcl-8.5.9.recipe
@@ -1,31 +1,80 @@
-DESCRIPTION="Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language, suitable for a very wide range of uses." 
+SUMMARY="Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language."
+DESCRIPTION="
+Tcl (Tool Command Language) is a very powerful but easy to learn
+dynamic programming language, suitable for a very wide range of uses,
+including web and desktop applications, networking, administration,
+testing and many more. Open source and business-friendly, Tcl is a
+mature yet evolving language that is truly cross platform, easily
+deployed and highly extensible."
+
 HOMEPAGE="http://www.tcl.tk" 
-SRC_URI="http://sourceforge.net/projects/tcl/files/Tcl/8.5.9/tcl8.5.9-src.tar.gz/download"
+SRC_URI="http://sourceforge.net/projects/tcl/files/Tcl/8.5.9/tcl8.5.9-src.tar.gz"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86 x86_gcc2"
 CHECKSUM_MD5="8512d8db3233041dd68a81476906012a"
+LICENSE="BSD (2-clause)"
+COPYRIGHT="Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState Corporation and other parties"
+SOURCE_DIR="tcl8.5.9"
+
+PATCHES="tcl-8.5.9.patch"
+
+PROVIDES="
+	tcl = $portVersion compat >= 8.5
+	cmd:tclsh = $portVersion compat >= 8.5
+	cmd:tclsh8.5 = $portVersion compat >= 8.5
+	lib:libtcl8.5 = $portVersion compat >= 8.5
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:make
+	cmd:gcc
+	cmd:ld
+	cmd:find
+	cmd:sed
+	cmd:grep
+	"
+
 BUILD()
 {
-	cd tcl8.5.9/unix
+	cd unix
 	autoconf -f
-	./configure --prefix=$(finddir B_COMMON_DIRECTORY) \
+	runConfigure ./configure \
 	--enable-threads --enable-man-symlinks
 	make
 }
 
 INSTALL()
 {
-	cd tcl8.5.9/unix
+	cd unix
 	make install
-	ln -s tclsh8.5 "$(finddir B_COMMON_BIN_DIRECTORY)/tclsh"
+
+	ln -s tclsh8.5 "${binDir}/tclsh"
+
+	prepareInstalledDevelLibs libtclstub8.5
+	packageEntries devel $developDir
+	packageEntries devel ${libDir}/tclConfig.sh
 }
 
 TEST()
 {
-	cd tcl8.5.9/unix
+	cd unix
 	make test
 }
 
-LICENSE="BSD (2-clause)"
-#COPYRIGHT=""
+PROVIDES_devel="
+	tcl_devel = $portVersion
+	devel:libtclstub8.5 = $portVersion
+	"
+
+REQUIRES_devel="
+	tcl == $portVersion
+	"
diff --git a/dev-lang/tcl/tcl-8.6b1-1.build b/dev-lang/tcl/tcl-8.6b1-1.build
deleted file mode 100644
index 57269204a..000000000
--- a/dev-lang/tcl/tcl-8.6b1-1.build
+++ /dev/null
@@ -1,7 +0,0 @@
-cd tcl8.6b1/pkgs/tdbc1.0b1
-autoconf
-cd ../../unix
-autoconf
-mkdir build && cd build
-../configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-man-symlinks
-make
diff --git a/dev-lang/tcl/tcl-8.6b1-1.install b/dev-lang/tcl/tcl-8.6b1-1.install
deleted file mode 100644
index fb692a7fd..000000000
--- a/dev-lang/tcl/tcl-8.6b1-1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-cd tcl8.6b1/unix/build
-make install
diff --git a/dev-lang/tcl/tcl-8.6b1-1.patch b/dev-lang/tcl/tcl-8.6b1-1.patch
deleted file mode 100644
index f25c6b5c6..000000000
--- a/dev-lang/tcl/tcl-8.6b1-1.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -Naur tcl8.6b1/generic/tclPosixStr.c tcl8.6b1-haiku/generic/tclPosixStr.c
---- tcl8.6b1/generic/tclPosixStr.c	2008-04-28 00:21:32.028049408 +0200
-+++ tcl8.6b1-haiku/generic/tclPosixStr.c	2011-06-11 21:57:53.249036800 +0200
-@@ -941,7 +941,9 @@
-     case SIGALRM: return "SIGALRM";
- #endif
- #ifdef SIGBUS
--    case SIGBUS: return "SIGBUS";
-+#  if !defined(SIGSEGV) || (SIGBUS != SIGSEGV)
-+ 	case SIGBUS: return "SIGBUS";
-+#  endif
- #endif
- #ifdef SIGCHLD
-     case SIGCHLD: return "SIGCHLD";
-@@ -1072,7 +1074,9 @@
-     case SIGALRM: return "alarm clock";
- #endif
- #ifdef SIGBUS
--    case SIGBUS: return "bus error";
-+#  if !defined(SIGSEGV) || (SIGBUS != SIGSEGV)
-+ 	case SIGBUS: return "bus error";
-+#  endif
- #endif
- #ifdef SIGCHLD
-     case SIGCHLD: return "child status changed";
-diff -Naur tcl8.6b1/pkgs/tdbc1.0b1/tclconfig/tcl.m4 tcl8.6b1-haiku/pkgs/tdbc1.0b1/tclconfig/tcl.m4
---- tcl8.6b1/pkgs/tdbc1.0b1/tclconfig/tcl.m4	2008-12-22 18:45:06.004456448 +0100
-+++ tcl8.6b1-haiku/pkgs/tdbc1.0b1/tclconfig/tcl.m4	2011-06-11 21:58:19.403177472 +0200
-@@ -761,8 +761,15 @@
- 			    # The space is needed
- 			    THREADS_LIBS=" -pthread"
- 			else
--			    TCL_THREADS=0
--			    AC_MSG_WARN([Do not know how to find pthread lib on your system - thread support disabled])
-+				# Haiku
-+	    		AC_CHECK_LIB(root,pthread_mutex_init,tcl_ok=yes,tcl_ok=no)
-+				if test "$tcl_ok" = "yes"; then
-+				    # The space is needed
-+				    THREADS_LIBS=" -lroot"
-+				else
-+				    TCL_THREADS=0
-+				    AC_MSG_WARN([Do not know how to find pthread lib on your system - thread support disabled])
-+				fi
- 			fi
- 		    fi
- 		fi
-@@ -1459,6 +1466,15 @@
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-+	Haiku*)
-+	    SHLIB_CFLAGS="-fPIC"
-+	    SHLIB_LD='${CC} -nostart'
-+	    SHLIB_LD_LIBS='${LIBS}'
-+	    SHLIB_SUFFIX=".so"
-+	    DL_OBJS="tclLoadDl.o"
-+	    DL_LIBS="-lroot"
-+	    LIBS="$LIBS -lnetwork"
-+	    ;;
- 	HP-UX-*.11.*)
- 	    # Use updated header definitions where possible
- 	    AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Do we want to use the XOPEN network library?])
-diff -Naur tcl8.6b1/unix/tcl.m4 tcl8.6b1-haiku/unix/tcl.m4
---- tcl8.6b1/unix/tcl.m4	2008-12-22 18:45:06.034603008 +0100
-+++ tcl8.6b1-haiku/unix/tcl.m4	2011-06-11 22:04:12.228327424 +0200
-@@ -667,8 +667,15 @@
- 			# The space is needed
- 			THREADS_LIBS=" -pthread"
- 		    else
--			TCL_THREADS=0
--			AC_MSG_WARN([Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...])
-+				# Haiku
-+	    		AC_CHECK_LIB(root,pthread_mutex_init,tcl_ok=yes,tcl_ok=no)
-+				if test "$tcl_ok" = "yes"; then
-+				    # The space is needed
-+				    THREADS_LIBS=" -lroot"
-+				else
-+				    TCL_THREADS=0
-+					AC_MSG_WARN([Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...])
-+				fi
- 		    fi
- 		fi
- 	    fi
-@@ -1252,6 +1259,15 @@
- 	    CC_SEARCH_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
- 	    ;;
-+	Haiku*)
-+	    SHLIB_CFLAGS="-fPIC"
-+	    SHLIB_LD='${CC} -nostart'
-+	    SHLIB_LD_LIBS='${LIBS}'
-+	    SHLIB_SUFFIX=".so"
-+	    DL_OBJS="tclLoadDl.o"
-+	    DL_LIBS="-lroot"
-+	    LIBS="$LIBS -lnetwork"
-+	    ;;
- 	HP-UX-*.11.*)
- 	    # Use updated header definitions where possible
- 	    AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Do we want to use the XOPEN network library?])
diff --git a/dev-lang/tcl/tcl-8.6b1-1.test b/dev-lang/tcl/tcl-8.6b1-1.test
deleted file mode 100644
index 65e892762..000000000
--- a/dev-lang/tcl/tcl-8.6b1-1.test
+++ /dev/null
@@ -1,2 +0,0 @@
-cd tcl8.6b1/unix/build
-make test