Index: tcl/build.sh
==================================================================
--- tcl/build.sh
+++ tcl/build.sh
@@ -28,20 +28,20 @@
 
 	use_fossil='0'
 	if echo "${TCLVERS}" | grep '^cvs_' >/dev/null; then
 		use_fossil='1'
 
-		CVSTAG=$(echo "${TCLVERS}" | sed 's/^cvs_//g')
-		if [ "${CVSTAG}" = "HEAD" ]; then
-			CVSTAG="trunk"
+		FOSSILTAG=$(echo "${TCLVERS}" | sed 's/^cvs_//g')
+		if [ "${FOSSILTAG}" = "HEAD" ]; then
+			FOSSILTAG="trunk"
 		fi
 	elif echo "${TCLVERS}" | grep '^fossil_' >/dev/null; then
 		use_fossil='1'
 
-		CVSTAG=$(echo "${TCLVERS}" | sed 's/^fossil_//g')
+		FOSSILTAG=$(echo "${TCLVERS}" | sed 's/^fossil_//g')
 	fi
-	export CVSTAG
+	export FOSSILTAG
 
 	if [ "${use_fossil}" = "1" ]; then
 		(
 			cd src || exit 1
 
@@ -49,14 +49,14 @@
 			rm -rf "${workdir}"
 
 			mkdir "${workdir}" || exit 1
 			cd "${workdir}" || exit 1
 
-			wget -O "tmp-tcl.tar.gz" "http://core.tcl.tk/tcl/tarball/tcl-fossil.tar.gz?uuid=${CVSTAG}" || rm -f 'tmp-tcl.tar.gz'
-			wget -O "tmp-itcl.tar.gz" "http://core.tcl.tk/itcl/tarball/itcl-fossil.tar.gz?uuid=${CVSTAG}" || rm -f 'tmp-itcl.tar.gz'
-			wget -O "tmp-thread.tar.gz" "http://core.tcl.tk/thread/tarball/thread-fossil.tar.gz?uuid=${CVSTAG}" || rm -f "tmp-thread.tar.gz"
-			wget -O "tmp-tclconfig.tar.gz" "http://core.tcl.tk/tclconfig/tarball/tclconfig-fossil.tar.gz?uuid=${CVSTAG}" || rm -f "tmp-tclconfig.tar.gz"
+			wget -O "tmp-tcl.tar.gz" "http://core.tcl.tk/tcl/tarball/tcl-fossil.tar.gz?uuid=${FOSSILTAG}" || rm -f 'tmp-tcl.tar.gz'
+			wget -O "tmp-itcl.tar.gz" "http://core.tcl.tk/itcl/tarball/itcl-fossil.tar.gz?uuid=${FOSSILTAG}" || rm -f 'tmp-itcl.tar.gz'
+			wget -O "tmp-thread.tar.gz" "http://core.tcl.tk/thread/tarball/thread-fossil.tar.gz?uuid=${FOSSILTAG}" || rm -f "tmp-thread.tar.gz"
+			wget -O "tmp-tclconfig.tar.gz" "http://core.tcl.tk/tclconfig/tarball/tclconfig-fossil.tar.gz?uuid=${FOSSILTAG}" || rm -f "tmp-tclconfig.tar.gz"
 
 			gzip -dc 'tmp-tcl.tar.gz' | tar -xf -
 			gzip -dc "tmp-itcl.tar.gz" | tar -xf -
 			gzip -dc "tmp-thread.tar.gz" | tar -xf -
 			gzip -dc "tmp-tclconfig.tar.gz" | tar -xf -

Index: tk/build.sh
==================================================================
--- tk/build.sh
+++ tk/build.sh
@@ -36,20 +36,20 @@
 
 	use_fossil='0'
 	if echo "${TCLVERS}" | grep '^cvs_' >/dev/null; then
 		use_fossil='1'
 
-		CVSTAG=$(echo "${TCLVERS}" | sed 's/^cvs_//g')
-		if [ "${CVSTAG}" = "HEAD" ]; then
-			CVSTAG="trunk"
+		FOSSILTAG=$(echo "${TCLVERS}" | sed 's/^cvs_//g')
+		if [ "${FOSSILTAG}" = "HEAD" ]; then
+			FOSSILTAG="trunk"
 		fi
 	elif echo "${TCLVERS}" | grep '^fossil_' >/dev/null; then
 		use_fossil='1'
 
-		CVSTAG=$(echo "${TCLVERS}" | sed 's/^fossil_//g')
+		FOSSILTAG=$(echo "${TCLVERS}" | sed 's/^fossil_//g')
 	fi
-	export CVSTAG
+	export FOSSILTAG
 
 	if [ "${use_fossil}" = "1" ]; then
 		(       
 			cd src || exit 1
 
@@ -57,14 +57,14 @@
 			rm -rf "${workdir}"
 
 			mkdir "${workdir}" || exit 1
 			cd "${workdir}" || exit 1
 
-			wget -O "tmp-tk.tar.gz" "http://core.tcl.tk/tk/tarball/tk-${CVSTAG}.tar.gz?uuid=${CVSTAG}" || rm -f 'tmp-tk.tar.gz'
+			wget -O "tmp-tk.tar.gz" "http://core.tcl.tk/tk/tarball/tk-fossil.tar.gz?uuid=${FOSSILTAG}" || rm -f 'tmp-tk.tar.gz'
 			gzip -dc "tmp-tk.tar.gz" | tar -xf -
 
-			mv "tk-${CVSTAG}" "tk${TCLVERS}"
+			mv "tk-fossil" "tk${TCLVERS}"
                         
 			tar -cf - "tk${TCLVERS}" | gzip -c > "../../${SRC}"
 
 			cd ..
 			rm -rf "${workdir}"