Index: kitcreator
==================================================================
--- kitcreator
+++ kitcreator
@@ -24,10 +24,12 @@
 # Define the list of all packages, for cleaning purposes
 KITCREATOR_ALLPKGS="kitsh tcl tclvfs zlib tk itcl mk4tcl thread kitdll"
 for pkg in ${KITCREATOR_ALLPKGS}; do
 	rm -f "${pkg}/build.log"
 	rm -rf "${pkg}/out" "${pkg}/inst" "${pkg}/build"
+
+	rm -rf "${pkg}/src"/tmp-*
 
 	if [ "${mode}" = "distclean" ]; then
 		rm -rf "${pkg}/src"
 	fi
 done

Index: tcl/build.sh
==================================================================
--- tcl/build.sh
+++ tcl/build.sh
@@ -34,46 +34,39 @@
 		export CVSTAG
 
 		(
 			cd src || exit 1
 
-			rm -f "tmp-tcl.tar.gz" "tmp-itcl.tar.gz" "tmp-thread.tar.gz" "tmp-tclconfig.tar.gz"
-			wget -O "tmp-tcl.tar.gz" "http://core.tcl.tk/tcl/tarball/tcl-${CVSTAG}.tar.gz?uuid=${CVSTAG}" || rm -f 'tmp-tcl.tar.gz'
-			wget -O "tmp-itcl.tar.gz" "http://rkeene.org/projects/tcl/itcl.fossil/tarball/itcl-${CVSTAG}.tar.gz?uuid=${CVSTAG}" || rm -f 'tmp-itcl.tar.gz'
-			wget -O "tmp-thread.tar.gz" "http://rkeene.org/projects/tcl/thread.fossil/tarball/thread-${CVSTAG}.tar.gz?uuid=${CVSTAG}" || rm -f "tmp-thread.tar.gz"
-			wget -O "tmp-tclconfig.tar.gz" "http://rkeene.org/projects/tcl/tclconfig.fossil/tarball/tclconfig-${CVSTAG}.tar.gz?uuid=${CVSTAG}" || rm -f "tmp-tclconfig.tar.gz"
+			workdir="tmp-$$${RANDOM}${RANDOM}${RANDOM}"
+			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://rkeene.org/projects/tcl/itcl.fossil/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"
 
 			gzip -dc 'tmp-tcl.tar.gz' | tar -xf -
-			rm -f "tmp-tcl.tar.gz"
-			if [ -d "tcl-${CVSTAG}.tar" ]; then
-				rm -rf "tcl-${CVSTAG}"
-				mv "tcl-${CVSTAG}.tar" "tcl-${CVSTAG}"
-			fi
-
 			gzip -dc "tmp-itcl.tar.gz" | tar -xf -
-			rm -f "tmp-itcl.tar.gz"
-
 			gzip -dc "tmp-thread.tar.gz" | tar -xf -
-			rm -f "tmp-thread.tar.gz"
-
 			gzip -dc "tmp-tclconfig.tar.gz" | tar -xf -
-			rm -f "tmp-tclconfig.tar.gz"
-
-			rm -rf "tcl${TCLVERS}"
-			mv "tcl-${CVSTAG}" "tcl${TCLVERS}"
-			mv "itcl-${CVSTAG}" "tcl${TCLVERS}/pkgs/itcl"
-			mv "thread-${CVSTAG}" "tcl${TCLVERS}/pkgs/thread"
-			cp -r "tclconfig-${CVSTAG}" "tcl${TCLVERS}/pkgs/itcl/tclconfig"
-			cp -r "tclconfig-${CVSTAG}" "tcl${TCLVERS}/pkgs/thread/tclconfig"
-			mv "tclconfig-${CVSTAG}" "tcl${TCLVERS}/tclconfig"
-
-			tar -cf - "tcl${TCLVERS}" | gzip -c > "../${SRC}"
-
-			rm -f "tmp-tcl.tar.gz" "tmp-itcl.tar.gz" "tmp-thread.tar.gz" "tmp-tclconfig.tar.gz"
-			rm -rf "tcl-${CVSTAG}" "itcl-${CVSTAG}" "thread-${CVSTAG}" "tclconfig-${CVSTAG}"
-			rm -rf "tcl${TCLVERS}"
-		)
+
+			mv "tcl-fossil" "tcl${TCLVERS}"
+			mv "itcl-fossil" "tcl${TCLVERS}/pkgs/itcl"
+			mv "thread-fossil" "tcl${TCLVERS}/pkgs/thread"
+			cp -r "tclconfig-fossil" "tcl${TCLVERS}/pkgs/itcl/tclconfig"
+			cp -r "tclconfig-fossil" "tcl${TCLVERS}/pkgs/thread/tclconfig"
+			mv "tclconfig-fossil" "tcl${TCLVERS}/tclconfig"
+
+			tar -cf - "tcl${TCLVERS}" | gzip -c > "../../${SRC}"
+
+			cd ..
+
+			rm -rf "${workdir}"
+		) || exit 1
 	else
 		rm -f "${SRC}.tmp"
 		wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
 		mv "${SRC}.tmp" "${SRC}"
 	fi

Index: tk/build.sh
==================================================================
--- tk/build.sh
+++ tk/build.sh
@@ -42,28 +42,25 @@
 		export CVSTAG
 
 		(       
 			cd src || exit 1
 
-			rm -f "tmp-tk.tar.gz"
-			wget -O "tmp-tk.tar.gz" "http://core.tcl.tk/tk/tarball/tk-${CVSTAG}.tar.gz?uuid=${CVSTAG}" || rm -f 'tmp-tk.tar.gz'
+			workdir="tmp-$$${RANDOM}${RANDOM}${RANDOM}"
+			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'
 			gzip -dc "tmp-tk.tar.gz" | tar -xf -
-			rm -f "tmp-tk.tar.gz"
-			if [ -d "tk-${CVSTAG}.tar" ]; then
-				rm -rf "tk-${CVSTAG}"
-				mv "tk-${CVSTAG}.tar" "tk-${CVSTAG}"
-			fi
 
-			rm -rf "tk${TCLVERS}"
 			mv "tk-${CVSTAG}" "tk${TCLVERS}"
                         
-			tar -cf - "tk${TCLVERS}" | gzip -c > "../${SRC}"
+			tar -cf - "tk${TCLVERS}" | gzip -c > "../../${SRC}"
 
-			rm -f "tmp-tk.tar.gz"
-			rm -rf "tk-${CVSTAG}"
-			rm -rf "tk${TCLVERS}"
+			cd ..
+			rm -rf "${workdir}"
 		)
 	else
 		rm -f "${SRC}.tmp"
 		wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
 		mv "${SRC}.tmp" "${SRC}"