@@ -8,15 +8,24 @@
 if [ -z "${TCLVERS}" ]; then
 	echo 'ERROR: The TCLVERS environment variable is not set' >&2
 
 	exit 1
 fi
+
+case "${TCLVERS}" in
+	*:*)
+		TCLVERS_CLEAN="$(echo "${TCLVERS}" | sed 's@:@_@g')"
+		;;
+	*)
+		TCLVERS_CLEAN="${TCLVERS}"
+		;;
+esac
 
 SRC="src/tk${TCLVERS}.tar.gz"
 SRCURL="http://prdownloads.sourceforge.net/tcl/tk${TCLVERS}-src.tar.gz"
 SRCHASH='-'
-BUILDDIR="$(pwd)/build/tk${TCLVERS}"
+BUILDDIR="$(pwd)/build/tk${TCLVERS_CLEAN}"
 PATCHDIR="$(pwd)/patches"
 OUTDIR="$(pwd)/out"
 INSTDIR="$(pwd)/inst"
 PATCHSCRIPTDIR="$(pwd)/patchscripts"
 export SRC SRCURL BUILDDIR PATCHDIR OUTDIR INSTDIR PATCHSCRIPTDIR
@@ -100,13 +109,13 @@
 			if [ ! -s 'tmp-tk.tar.gz' ]; then
 				download "http://core.tcl.tk/tk/tarball/tk-fossil.tar.gz?uuid=${FOSSILDATE}" "tmp-tk.tar.gz" - || rm -f 'tmp-tk.tar.gz'
 				gzip -dc "tmp-tk.tar.gz" | tar -xf -
 			fi
 
-			mv "tk-fossil" "tk${TCLVERS}"
+			mv "tk-fossil" "tk${TCLVERS_CLEAN}"
                         
-			tar -cf - "tk${TCLVERS}" | gzip -c > "../../${SRC}"
+			tar -cf - "tk${TCLVERS_CLEAN}" | gzip -c > "../../${SRC}"
 
 			cd ..
 			rm -rf "${workdir}"
 		)
 	else