diff --git a/Programming/Tcl/8/variants b/Programming/Tcl/8/variants
new file mode 100644
index 0000000..6b32bde
--- /dev/null
+++ b/Programming/Tcl/8/variants
@@ -0,0 +1,2 @@
+Tcl/8.6.3            stable
+Tcl/8.6.4            stable
diff --git a/Programming/Tcl/build b/Programming/Tcl/build
index 43c6e71..1c84723 100755
--- a/Programming/Tcl/build
+++ b/Programming/Tcl/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+SOURCE_URL="ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl$V-src.tar.gz"
+
 pbuild::configure() {
 	case ${OS} in
 	Linux )
diff --git a/Programming/Tk/build b/Programming/Tk/build
index 966b97e..e6419ed 100755
--- a/Programming/Tk/build
+++ b/Programming/Tk/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+SOURCE_URL="ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tk$V-src.tar.gz"
+
 pbuild::configure() {
 	case ${OS} in
 	Linux )
diff --git a/Programming/binutils/2/variants b/Programming/binutils/2/variants
new file mode 100644
index 0000000..ae8d5a3
--- /dev/null
+++ b/Programming/binutils/2/variants
@@ -0,0 +1 @@
+binutils/2.25 stable
diff --git a/Programming/cmake/2/variants b/Programming/cmake/2/variants
new file mode 100644
index 0000000..9b22317
--- /dev/null
+++ b/Programming/cmake/2/variants
@@ -0,0 +1,4 @@
+cmake/2.8.12.2       stable
+cmake/2.8.12.2       stable
+cmake/2.8.12.2       stable
+cmake/2.8.12.2       stable
diff --git a/Programming/cmake/3/variants b/Programming/cmake/3/variants
new file mode 100644
index 0000000..9cc3fe0
--- /dev/null
+++ b/Programming/cmake/3/variants
@@ -0,0 +1,12 @@
+cmake/3.1.3          stable
+cmake/3.1.3          stable
+cmake/3.1.3          stable
+cmake/3.1.3          stable
+cmake/3.3.2          stable
+cmake/3.3.2          stable
+cmake/3.3.2          stable
+cmake/3.3.2          stable
+cmake/3.4.1          stable
+cmake/3.4.1          stable
+cmake/3.4.1          stable
+cmake/3.4.1          stable
diff --git a/Programming/m4/1/variants b/Programming/m4/1/variants
new file mode 100644
index 0000000..b1fe26d
--- /dev/null
+++ b/Programming/m4/1/variants
@@ -0,0 +1 @@
+m4/1.4.17	stable
diff --git a/Tools/git/2/variants b/Tools/git/2/variants
index 165ef52..cde3ffb 100644
--- a/Tools/git/2/variants
+++ b/Tools/git/2/variants
@@ -1,4 +1,3 @@
-2.3.3	Linux,Darwin	stable		Tcl/8.6.4 Tk/8.6.4
-2.5.2	Linux,Darwin	stable		Tcl/8.6.4 Tk/8.6.4
-2.8.1	Linux,Darwin	unstable	Tcl/8.6.4 Tk/8.6.4
-
+git/2.3.3	stable		Tcl/8.6.4 Tk/8.6.4
+git/2.5.2	stable		Tcl/8.6.4 Tk/8.6.4
+git/2.8.1	stable		Tcl/8.6.4 Tk/8.6.4
diff --git a/Tools/git/build b/Tools/git/build
index 2340561..eb26d30 100755
--- a/Tools/git/build
+++ b/Tools/git/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+SOURCE_URL="ftp://www.kernel.org/pub/software/scm/$P/$P-$V.tar.gz"
+
 case ${OS} in
 Darwin )
 	export NO_APPLE_COMMON_CRYPTO=1
@@ -32,7 +34,6 @@ pbuild::install() {
 }
 
 pbuild::add_to_group 'Tools'
-pbuild::set_runtime_dependencies 'Tcl' 'Tk'
 pbuild::set_docfiles 'COPYING' 'README.md'
 pbuild::make_all