Index: build/makearch.info
==================================================================
--- build/makearch.info
+++ build/makearch.info
@@ -14,11 +14,11 @@
 # each time a "makearch" is done.
 #
 # If @@SVNLCR@@ is used anywhere in this version number, it will be
 # replaced with the highest last-changed-rev from the output of
 #   svn info -R    (or 0)
-VERS="0.6.0"
+VERS="0.6.1"
 
 # Space sperated list of documents, if they exist, they will be
 # prefixed with the contents of the DOC_HDR file and substitution
 # will occur:
 #     @@UTIL@@ becomes the utility name ${UTIL}

Index: tk/build.sh
==================================================================
--- tk/build.sh
+++ tk/build.sh
@@ -39,12 +39,19 @@
 	mkdir 'src' >/dev/null 2>/dev/null
 
 	use_fossil='0'
 	if echo "${TCLVERS}" | grep '^cvs_' >/dev/null; then
 		use_fossil='1'
+
+		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'
+
+		FOSSILTAG=$(echo "${TCLVERS}" | sed 's/^fossil_//g')
 	fi
 
 	if [ -d 'buildsrc' ]; then
 		# Override here to avoid downloading tarball from Fossil if we
 		# have a particular tree already available.
@@ -61,12 +68,17 @@
 			rm -rf "${workdir}"
 
 			mkdir "${workdir}" || exit 1
 			cd "${workdir}" || exit 1
 
-			wget -O "tmp-tk.tar.gz" "http://core.tcl.tk/tk/tarball/tk-fossil.tar.gz?uuid=${FOSSILDATE}" || rm -f 'tmp-tk.tar.gz'
-			gzip -dc "tmp-tk.tar.gz" | tar -xf -
+			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 - || rm -f 'tmp-tk.tar.gz'
+
+			if [ ! -s 'tmp-tk.tar.gz' ]; then
+				wget -O "tmp-tk.tar.gz" "http://core.tcl.tk/tk/tarball/tk-fossil.tar.gz?uuid=${FOSSILDATE}" || rm -f 'tmp-tk.tar.gz'
+				gzip -dc "tmp-tk.tar.gz" | tar -xf -
+			fi
 
 			mv "tk-fossil" "tk${TCLVERS}"
                         
 			tar -cf - "tk${TCLVERS}" | gzip -c > "../../${SRC}"