diff --git a/scripts/Programming/Tcl/build b/scripts/Programming/Tcl/build
index 402004d..6aa8add 100755
--- a/scripts/Programming/Tcl/build
+++ b/scripts/Programming/Tcl/build
@@ -21,7 +21,9 @@ function em.post_install() {
 	{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
 }
 
+# use system's cc
+declare CC=cc
+
 em.add_to_family 'Programming'
 em.set_docfiles 'license.terms' 'README'
-em.set_build_dependencies "${COMPILER}"
 em.make_all
diff --git a/scripts/Programming/Tk/build b/scripts/Programming/Tk/build
new file mode 100755
index 0000000..9ca58c4
--- /dev/null
+++ b/scripts/Programming/Tk/build
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+source "$(dirname $0)/../../../lib/libem.bash"
+
+function em.configure() {
+	case ${OS} in
+	Linux )
+		srcdir="${MODULE_SRCDIR}/unix"
+		;;
+	Darwin )
+		srcdir="${MODULE_SRCDIR}/macosx"
+		;;
+	esac
+	"${srcdir}"/configure \
+		--prefix="${PREFIX}" \
+		--with-tcl=${TCL_PREFIX}/lib \
+		--enable-shared=no \
+		|| exit 1
+}
+
+function em.post_install() {
+	:
+	#{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
+}
+
+# use system's cc
+declare CC=cc
+
+em.add_to_family 'Programming'
+em.set_build_dependencies 'Tcl'
+em.set_docfiles 'license.terms' 'README'
+em.make_all
diff --git a/scripts/Tools/git/build b/scripts/Tools/git/build
index ed9c700..52423c3 100755
--- a/scripts/Tools/git/build
+++ b/scripts/Tools/git/build
@@ -16,6 +16,7 @@ function em.build() {
 }
 
 em.add_to_family 'Tools'
+em.set_runtime_dependencies 'Tcl' 'Tk'
 em.set_docfiles 'COPYING' 'README'
 em.make_all
 
diff --git a/scripts/Tools/git/with_modules b/scripts/Tools/git/with_modules
new file mode 100644
index 0000000..70974ad
--- /dev/null
+++ b/scripts/Tools/git/with_modules
@@ -0,0 +1,2 @@
+Tcl/8.6.4
+Tk/8.6.4