diff --git a/src/09_generate_rootfs.sh b/src/09_generate_rootfs.sh
index 6458ef57d..1d0160276 100755
--- a/src/09_generate_rootfs.sh
+++ b/src/09_generate_rootfs.sh
@@ -24,9 +24,9 @@ cp -r ../minimal_rootfs/* rootfs
 
 cd rootfs
 
-# Delete the '.gitignore' files which we use in order to keep track of otherwise
+# Delete the '.keep' files which we use in order to keep track of otherwise
 # empty folders.
-find * -type f -name '.gitignore' -exec rm {} +
+find * -type f -name '.keep' -exec rm {} +
 
 # Remove 'linuxrc' which is used when we boot in 'RAM disk' mode.
 rm -f linuxrc
diff --git a/src/minimal_overlay/bundles/mll_source/bundle.sh b/src/minimal_overlay/bundles/mll_source/bundle.sh
index 442855a22..ed3a40def 100755
--- a/src/minimal_overlay/bundles/mll_source/bundle.sh
+++ b/src/minimal_overlay/bundles/mll_source/bundle.sh
@@ -22,9 +22,9 @@ cp -r $MAIN_SRC_DIR/minimal_config $DEST_DIR/usr/src
 
 cd $DEST_DIR/usr/src
 
-# Delete the '.gitignore' files which we use in order to keep track of otherwise
+# Delete the '.keep' files which we use in order to keep track of otherwise
 # empty folders.
-find * -type f -name '.gitignore' -exec rm {} +
+find * -type f -name '.keep' -exec rm {} +
 
 # With '--remove-destination' all possibly existing soft links in
 # '$OVERLAY_ROOTFS' will be overwritten correctly.
diff --git a/src/minimal_rootfs/dev/.gitignore b/src/minimal_rootfs/dev/.keep
similarity index 100%
rename from src/minimal_rootfs/dev/.gitignore
rename to src/minimal_rootfs/dev/.keep
diff --git a/src/minimal_rootfs/lib/.gitignore b/src/minimal_rootfs/lib/.keep
similarity index 100%
rename from src/minimal_rootfs/lib/.gitignore
rename to src/minimal_rootfs/lib/.keep
diff --git a/src/minimal_rootfs/mnt/.gitignore b/src/minimal_rootfs/mnt/.keep
similarity index 100%
rename from src/minimal_rootfs/mnt/.gitignore
rename to src/minimal_rootfs/mnt/.keep
diff --git a/src/minimal_rootfs/proc/.gitignore b/src/minimal_rootfs/proc/.keep
similarity index 100%
rename from src/minimal_rootfs/proc/.gitignore
rename to src/minimal_rootfs/proc/.keep
diff --git a/src/minimal_rootfs/root/.gitignore b/src/minimal_rootfs/root/.keep
similarity index 100%
rename from src/minimal_rootfs/root/.gitignore
rename to src/minimal_rootfs/root/.keep
diff --git a/src/minimal_rootfs/sys/.gitignore b/src/minimal_rootfs/sys/.keep
similarity index 100%
rename from src/minimal_rootfs/sys/.gitignore
rename to src/minimal_rootfs/sys/.keep
diff --git a/src/minimal_rootfs/tmp/.gitignore b/src/minimal_rootfs/tmp/.keep
similarity index 100%
rename from src/minimal_rootfs/tmp/.gitignore
rename to src/minimal_rootfs/tmp/.keep