diff --git a/src/08_generate_rootfs.sh b/src/08_generate_rootfs.sh
index 0cf151b9c..278a258f5 100755
--- a/src/08_generate_rootfs.sh
+++ b/src/08_generate_rootfs.sh
@@ -58,5 +58,9 @@ ln -s lib lib64
 
 # Copy all necessary 'glibc' libraries to '/lib' END.
 
+# Delete the '.gitignore' files which we use in order to keep track of otherwise
+# empty folders.
+find * -type f -name '.gitignore' -exec rm {} +
+
 cd ../..
 
diff --git a/src/11_generate_iso.sh b/src/11_generate_iso.sh
index a4046a68c..17837cf08 100755
--- a/src/11_generate_iso.sh
+++ b/src/11_generate_iso.sh
@@ -101,6 +101,10 @@ fi
 # Create ISOLINUX configuration file.
 echo 'default kernel.bz  initrd=rootfs.gz' > ./isolinux.cfg
 
+# Delete the '.gitignore' files which we use in order to keep track of otherwise
+# empty folders.
+find * -type f -name '.gitignore' -exec rm {} +
+
 # Now we generate the ISO image file.
 genisoimage -J -r -o ../minimal_linux_live.iso -b isolinux.bin -c boot.cat -input-charset UTF-8 -no-emul-boot -boot-load-size 4 -boot-info-table ./