diff --git a/CLFS/master.sh b/CLFS/master.sh
index 119e19e..4305a21 100755
--- a/CLFS/master.sh
+++ b/CLFS/master.sh
@@ -955,7 +955,7 @@ chapter7:  chapter6 $bootscripttools
 chapter8:  chapter7 $bootabletools
 
 clean-all:  clean
-	rm -rf ./{${PROGNAME}-commands,logs,${PROGNAME}-Makefile,clfs.xsl,makefile-functions,packages,patches}
+	rm -rf ./{clfs-commands,logs,Makefile,*.xsl,makefile-functions,packages,patches}
 
 clean:  clean-chapter4 clean-chapter3 clean-chapter2
 
@@ -1026,7 +1026,7 @@ makesys:  $testsuitetools $basicsystem $bootscripttools $bootabletools
 
 
 clean-all:  clean
-	rm -rf ./{${PROGNAME}-commands,logs,${PROGNAME}-Makefile,clfs.xsl,makefile-functions,packages,patches}
+	rm -rf ./{clfs-commands,logs,Makefile,*.xsl,makefile-functions,packages,patches}
 
 clean:  clean-makesys clean-makeboot clean-jhalfs
 
diff --git a/HLFS/master.sh b/HLFS/master.sh
index 6cc1776..787011b 100755
--- a/HLFS/master.sh
+++ b/HLFS/master.sh
@@ -452,7 +452,7 @@ chapter7_Makefiles() {       # Create a bootable system.. kernel, bootscripts..e
     wrt_target "$this_script" "$PREV"
 
     case "${this_script}" in
-      *bootscripts*) 
+      *bootscripts*)
         vrs=`grep "^lfs-bootscripts-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
         FILE="lfs-bootscripts-$vrs.tar.*"
         wrt_unpack2 "$FILE"
@@ -461,7 +461,7 @@ chapter7_Makefiles() {       # Create a bootable system.. kernel, bootscripts..e
         ;;
     esac
 
-    case "${this_script}" in 
+    case "${this_script}" in
       *fstab*) # Check if we have a real /etc/fstab file
         if [[ -n "$FSTAB" ]] ; then
           wrt_copy_fstab "$this_script"
@@ -562,7 +562,7 @@ chapter6:  chapter5 $chapter6
 chapter7:  chapter6 $chapter7
 
 clean-all:  clean
-	rm -rf ./{hlfs-commands,logs,Makefile,hlfs.xsl,patcheslist.xsl,functions,packages,patches}
+	rm -rf ./{hlfs-commands,logs,Makefile,*.xsl,patcheslist.xsl,makefile-functions,packages,patches}
 
 clean:  clean-chapter7 clean-chapter6 clean-chapter5 clean-chapter3
 
diff --git a/LFS/master.sh b/LFS/master.sh
index 4a74445..10488fe 100755
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -339,7 +339,7 @@ chapter6:  chapter5 $chapter6
 chapter789:  chapter6 $chapter789
 
 clean-all:  clean
-	rm -rf ./{lfs-commands,logs,Makefile,dump-lfs-scripts.xsl,functions,packages,patches}
+	rm -rf ./{lfs-commands,logs,Makefile,*.xsl,makefile-functions,packages,patches}
 
 clean:  clean-chapter789 clean-chapter6 clean-chapter5 clean-chapter4