diff --git a/Programming/TclTk/build b/Programming/TclTk/build
new file mode 100755
index 0000000..d7fb54a
--- /dev/null
+++ b/Programming/TclTk/build
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+./build_Tcl "$@" ||exit $?
+./build_Tk  -f "$@"
diff --git a/Programming/TclTk/build_Tcl b/Programming/TclTk/build_Tcl
new file mode 100755
index 0000000..f227ac2
--- /dev/null
+++ b/Programming/TclTk/build_Tcl
@@ -0,0 +1,30 @@
+#!/usr/bin/env modbuild
+
+pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl${V_PKG}-src.tar.gz"
+
+pbuild::add_to_group 'Programming'
+pbuild::install_docfiles 'license.terms' 'README'
+
+#pbuild::pre_prep() {
+#	pbuild::set_unpack_dir "tcl${V_PKG}-src.tar.gz" "${SRC_DIR}/Tcl"
+#	pbuild::set_unpack_dir "tk${V_PKG}-src.tar.gz"  "${SRC_DIR}/Tk"
+#}
+
+pbuild::pre_configure_Linux() {
+	srcdir="${SRC_DIR}/unix"
+}
+
+pbuild::pre_configure_Darwin() {
+	srcdir="${SRC_DIR}/macosx"
+}
+
+pbuild::configure() {
+	"${srcdir}"/configure \
+		--prefix="${PREFIX}" \
+		--enable-shared=no \
+		|| exit 1
+}
+
+pbuild::post_install() {
+	{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
+}
diff --git a/Programming/TclTk/build_Tk b/Programming/TclTk/build_Tk
new file mode 100755
index 0000000..365d439
--- /dev/null
+++ b/Programming/TclTk/build_Tk
@@ -0,0 +1,38 @@
+#!/usr/bin/env modbuild
+
+pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tk8_6/tk${V_PKG}-src.tar.gz"
+
+pbuild::add_to_group 'Programming'
+pbuild::install_docfiles 'license.terms' 'README'
+
+
+pbuild::pre_configure_Linux() {
+	srcdir="${SRC_DIR}/unix"
+}
+
+pbuild::pre_configure_Darwin() {
+	srcdir="${SRC_DIR}/macosx"
+}
+
+pbuild::configure() {
+	export PATH="${PREFIX}/bin:$PATH"
+	export C_INCLUDE_PATH="${PREFIX}/include:${C_INCLUDE_PATH}"
+	export LIBRARY_PATH="${PREFIX}/lib:${LIBRARY_PATH}"
+
+	"${srcdir}"/configure \
+		--prefix="${PREFIX}" \
+		--enable-shared=no \
+		--with-tcl="${PREFIX}/lib" \
+		|| exit 1
+}
+
+pbuild::compile() {
+	export PATH="${PREFIX}/bin:$PATH"
+	export C_INCLUDE_PATH="${PREFIX}/include:${C_INCLUDE_PATH}"
+	export LIBRARY_PATH="${PREFIX}/lib:${LIBRARY_PATH}"
+        make -j3
+}
+
+pbuild::post_install() {
+	{ cd "${PREFIX}"/bin && rm -f wish && ln -fs wish${V%.*} wish; };
+}
diff --git a/Programming/TclTk/files/variants.rhel6 b/Programming/TclTk/files/variants.rhel6
new file mode 100644
index 0000000..a4f9b5b
--- /dev/null
+++ b/Programming/TclTk/files/variants.rhel6
@@ -0,0 +1 @@
+TclTk/8.6.9	stable
diff --git a/Programming/TclTk/modulefile b/Programming/TclTk/modulefile
new file mode 100644
index 0000000..a26e306
--- /dev/null
+++ b/Programming/TclTk/modulefile
@@ -0,0 +1,16 @@
+#%Module1.0
+
+module-whatis		"a very powerful, easy to learn programming language"
+module-url		"http://www.tcl.tk"
+module-license		"BSD-lik"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+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. 
+"
+