diff --git a/scripts/Cleanup b/scripts/Cleanup
index f79bcc99d..ef1e5266e 100755
--- a/scripts/Cleanup
+++ b/scripts/Cleanup
@@ -42,8 +42,6 @@ while [ "$1" ] ; do
 	esac
 done
 
-make -C misc/isomd5sum clean || true
-
 # Remove src*
 #
 for x in src src.* build/*/ROCK/src.*; do
diff --git a/scripts/Create-ISO b/scripts/Create-ISO
index 5000b83da..19fb3916f 100755
--- a/scripts/Create-ISO
+++ b/scripts/Create-ISO
@@ -54,9 +54,11 @@ done
 
 spacer="    "
 
-if [ "$implantisomd5" = 1 -a ! -x ./misc/isomd5sum/implantisomd5 ] ; then
+if [ "$implantisomd5" = 1 -a ! -x src/isomd5sum/implantisomd5 ] ; then
 	echo ; date "+  [%X] Creating ISO-MD5 tools ..."
-	make -C misc/isomd5sum all
+	rm -rf src/isomd5sum; mkdir -p src/isomd5sum
+	cp misc/isomd5sum/* src/isomd5sum/
+	make -C src/isomd5sum all
 fi
 
 echo ; date "+  [%X] Removing old files with same prefix ..."
@@ -267,7 +269,7 @@ for x in $disks ; do
 
 	if [ "$implantisomd5" = 1 -a -x ./misc/isomd5sum/implantisomd5 ] ; then
 		echo "$spacer Calculating and implanting MD5 checksum ..."
-		./misc/isomd5sum/implantisomd5 ${isoprefix}_cd$x.iso >/dev/null
+		./src/isomd5sum/implantisomd5 ${isoprefix}_cd$x.iso >/dev/null
 	fi
 
 	if [ "$mkdebug" = 1 ] ; then