Index: tcl/build.sh
==================================================================
--- tcl/build.sh
+++ tcl/build.sh
@@ -26,20 +26,31 @@
 if [ ! -f "${SRC}" ]; then
 	mkdir 'src' >/dev/null 2>/dev/null
 
 	if echo "${TCLVERS}" | grep '^cvs_' >/dev/null; then
 		CVSTAG=$(echo "${TCLVERS}" | sed 's/^cvs_//g')
+		if [ "${CVSTAG}" = "HEAD" ]; then
+			CVSTAG="trunk"
+		fi
 		export CVSTAG
 
 		(
 			cd src || exit 1
 
-			cvs -z3 -d:pserver:anonymous@tcl.cvs.sourceforge.net:/cvsroot/tcl co -r "${CVSTAG}" -P tcl
+			rm -f "tmp-tcl.zip"
+			wget -O "tmp-tcl.zip" "http://tcltk.oc9.org/fossils/tcl/zip/unnamed-${CVSTAG}.zip?uuid=${CVSTAG}" || rm -f "tmp-tcl.zip"
+			unzip "tmp-tcl.zip"
+			rm -f "tmp-tcl.zip"
+
+			rm -rf "tcl${TCLVERS}"
+			mv "unnamed-${CVSTAG}" "tcl${TCLVERS}"
 
-			mv tcl "tcl${TCLVERS}"
+			if [ -d "tcl${TCLVERS}" ]; then
+				find "tcl${TCLVERS}" -name configure -type f | xargs chmod +x
 
-			tar -cf - "tcl${TCLVERS}" | gzip -c > "../${SRC}"
+				tar -cf - "tcl${TCLVERS}" | gzip -c > "../${SRC}"
+			fi
 		)
 	else
 		rm -f "${SRC}.tmp"
 		wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
 		mv "${SRC}.tmp" "${SRC}"

Index: tk/build.sh
==================================================================
--- tk/build.sh
+++ tk/build.sh
@@ -33,20 +33,31 @@
 if [ ! -f "${SRC}" ]; then
 	mkdir 'src' >/dev/null 2>/dev/null
 
 	if echo "${TCLVERS}" | grep '^cvs_' >/dev/null; then
 		CVSTAG=$(echo "${TCLVERS}" | sed 's/^cvs_//g')
+		if [ "${CVSTAG}" = "HEAD" ]; then
+			CVSTAG="trunk"
+		fi
 		export CVSTAG
 
 		(       
 			cd src || exit 1
 
-			cvs -z3 -d:pserver:anonymous@tcl.cvs.sourceforge.net:/cvsroot/tktoolkit co -r "${CVSTAG}" -P tk
-
-			mv tk "tk${TCLVERS}"
+			rm -f "tmp-tk.zip"
+			wget -O "tmp-tk.zip" "http://tcltk.oc9.org/fossils/tk/zip/unnamed-${CVSTAG}.zip?uuid=${CVSTAG}" || rm -f "tmp-tk.zip"
+			unzip "tmp-tk.zip"
+			rm -f "tmp-tk.zip"
 
-			tar -cf - "tk${TCLVERS}" | gzip -c > "../${SRC}"
+			rm -rf "tk${TCLVERS}"
+			mv "unnamed-${CVSTAG}" "tk${TCLVERS}"
+                        
+			if [ -d "tk${TCLVERS}" ]; then
+				find "tk${TCLVERS}" -name configure -type f | xargs chmod +x
+                                
+				tar -cf - "tk${TCLVERS}" | gzip -c > "../${SRC}"
+			fi
 		)
 	else
 		rm -f "${SRC}.tmp"
 		wget -O "${SRC}.tmp" "${SRCURL}" || exit 1
 		mv "${SRC}.tmp" "${SRC}"