diff --git a/base/sysfiles/etc_conf_NOTE.txt b/base/sysfiles/overlay.d/etc_conf_NOTE.txt
similarity index 100%
rename from base/sysfiles/etc_conf_NOTE.txt
rename to base/sysfiles/overlay.d/etc_conf_NOTE.txt
diff --git a/base/sysfiles/etc_conf_console.txt b/base/sysfiles/overlay.d/etc_conf_console.txt
similarity index 100%
rename from base/sysfiles/etc_conf_console.txt
rename to base/sysfiles/overlay.d/etc_conf_console.txt
diff --git a/base/sysfiles/etc_conf_devfs.txt b/base/sysfiles/overlay.d/etc_conf_devfs.txt
similarity index 100%
rename from base/sysfiles/etc_conf_devfs.txt
rename to base/sysfiles/overlay.d/etc_conf_devfs.txt
diff --git a/base/sysfiles/etc_conf_hardware.txt b/base/sysfiles/overlay.d/etc_conf_hardware.txt
similarity index 100%
rename from base/sysfiles/etc_conf_hardware.txt
rename to base/sysfiles/overlay.d/etc_conf_hardware.txt
diff --git a/base/sysfiles/etc_conf_kbd.txt b/base/sysfiles/overlay.d/etc_conf_kbd.txt
similarity index 100%
rename from base/sysfiles/etc_conf_kbd.txt
rename to base/sysfiles/overlay.d/etc_conf_kbd.txt
diff --git a/base/sysfiles/etc_conf_kernel.txt b/base/sysfiles/overlay.d/etc_conf_kernel.txt
similarity index 100%
rename from base/sysfiles/etc_conf_kernel.txt
rename to base/sysfiles/overlay.d/etc_conf_kernel.txt
diff --git a/base/sysfiles/etc_conf_pci.txt b/base/sysfiles/overlay.d/etc_conf_pci.txt
similarity index 100%
rename from base/sysfiles/etc_conf_pci.txt
rename to base/sysfiles/overlay.d/etc_conf_pci.txt
diff --git a/base/sysfiles/etc_conf_profile.txt b/base/sysfiles/overlay.d/etc_conf_profile.txt
similarity index 100%
rename from base/sysfiles/etc_conf_profile.txt
rename to base/sysfiles/overlay.d/etc_conf_profile.txt
diff --git a/base/sysfiles/etc_conf_usb.txt b/base/sysfiles/overlay.d/etc_conf_usb.txt
similarity index 100%
rename from base/sysfiles/etc_conf_usb.txt
rename to base/sysfiles/overlay.d/etc_conf_usb.txt
diff --git a/base/sysfiles/etc_dircolors.txt b/base/sysfiles/overlay.d/etc_dircolors.txt
similarity index 100%
rename from base/sysfiles/etc_dircolors.txt
rename to base/sysfiles/overlay.d/etc_dircolors.txt
diff --git a/base/sysfiles/etc_filesystems.txt b/base/sysfiles/overlay.d/etc_filesystems.txt
similarity index 100%
rename from base/sysfiles/etc_filesystems.txt
rename to base/sysfiles/overlay.d/etc_filesystems.txt
diff --git a/base/sysfiles/etc_fstab.txt b/base/sysfiles/overlay.d/etc_fstab.txt
similarity index 100%
rename from base/sysfiles/etc_fstab.txt
rename to base/sysfiles/overlay.d/etc_fstab.txt
diff --git a/base/sysfiles/etc_group.txt b/base/sysfiles/overlay.d/etc_group.txt
similarity index 100%
rename from base/sysfiles/etc_group.txt
rename to base/sysfiles/overlay.d/etc_group.txt
diff --git a/base/sysfiles/etc_gshadow.txt b/base/sysfiles/overlay.d/etc_gshadow.txt
similarity index 100%
rename from base/sysfiles/etc_gshadow.txt
rename to base/sysfiles/overlay.d/etc_gshadow.txt
diff --git a/base/sysfiles/etc_host.conf.txt b/base/sysfiles/overlay.d/etc_host.conf.txt
similarity index 100%
rename from base/sysfiles/etc_host.conf.txt
rename to base/sysfiles/overlay.d/etc_host.conf.txt
diff --git a/base/sysfiles/etc_hosts.txt b/base/sysfiles/overlay.d/etc_hosts.txt
similarity index 100%
rename from base/sysfiles/etc_hosts.txt
rename to base/sysfiles/overlay.d/etc_hosts.txt
diff --git a/base/sysfiles/etc_init.d_functions-ansi.in.txt b/base/sysfiles/overlay.d/etc_init.d_functions-ansi.in.txt
similarity index 100%
rename from base/sysfiles/etc_init.d_functions-ansi.in.txt
rename to base/sysfiles/overlay.d/etc_init.d_functions-ansi.in.txt
diff --git a/base/sysfiles/etc_init.d_functions.in.txt b/base/sysfiles/overlay.d/etc_init.d_functions.in.txt
similarity index 100%
rename from base/sysfiles/etc_init.d_functions.in.txt
rename to base/sysfiles/overlay.d/etc_init.d_functions.in.txt
diff --git a/base/sysfiles/etc_initscript.txt b/base/sysfiles/overlay.d/etc_initscript.txt
similarity index 100%
rename from base/sysfiles/etc_initscript.txt
rename to base/sysfiles/overlay.d/etc_initscript.txt
diff --git a/base/sysfiles/etc_inputrc.txt b/base/sysfiles/overlay.d/etc_inputrc.txt
similarity index 100%
rename from base/sysfiles/etc_inputrc.txt
rename to base/sysfiles/overlay.d/etc_inputrc.txt
diff --git a/base/sysfiles/etc_networks.txt b/base/sysfiles/overlay.d/etc_networks.txt
similarity index 100%
rename from base/sysfiles/etc_networks.txt
rename to base/sysfiles/overlay.d/etc_networks.txt
diff --git a/base/sysfiles/etc_passwd.txt b/base/sysfiles/overlay.d/etc_passwd.txt
similarity index 100%
rename from base/sysfiles/etc_passwd.txt
rename to base/sysfiles/overlay.d/etc_passwd.txt
diff --git a/base/sysfiles/etc_profile.txt b/base/sysfiles/overlay.d/etc_profile.txt
similarity index 100%
rename from base/sysfiles/etc_profile.txt
rename to base/sysfiles/overlay.d/etc_profile.txt
diff --git a/base/sysfiles/etc_rc.d_rc.txt b/base/sysfiles/overlay.d/etc_rc.d_rc.txt
similarity index 100%
rename from base/sysfiles/etc_rc.d_rc.txt
rename to base/sysfiles/overlay.d/etc_rc.d_rc.txt
diff --git a/base/sysfiles/etc_resolv.conf.txt b/base/sysfiles/overlay.d/etc_resolv.conf.txt
similarity index 100%
rename from base/sysfiles/etc_resolv.conf.txt
rename to base/sysfiles/overlay.d/etc_resolv.conf.txt
diff --git a/base/sysfiles/etc_sakmsg.txt b/base/sysfiles/overlay.d/etc_sakmsg.txt
similarity index 100%
rename from base/sysfiles/etc_sakmsg.txt
rename to base/sysfiles/overlay.d/etc_sakmsg.txt
diff --git a/base/sysfiles/etc_shadow.txt b/base/sysfiles/overlay.d/etc_shadow.txt
similarity index 100%
rename from base/sysfiles/etc_shadow.txt
rename to base/sysfiles/overlay.d/etc_shadow.txt
diff --git a/base/sysfiles/etc_shells.txt b/base/sysfiles/overlay.d/etc_shells.txt
similarity index 100%
rename from base/sysfiles/etc_shells.txt
rename to base/sysfiles/overlay.d/etc_shells.txt
diff --git a/base/sysfiles/etc_sysctl.conf.txt b/base/sysfiles/overlay.d/etc_sysctl.conf.txt
similarity index 100%
rename from base/sysfiles/etc_sysctl.conf.txt
rename to base/sysfiles/overlay.d/etc_sysctl.conf.txt
diff --git a/base/sysfiles/sysfiles.conf b/base/sysfiles/sysfiles.conf
index cee4597d5..0b13ac632 100644
--- a/base/sysfiles/sysfiles.conf
+++ b/base/sysfiles/sysfiles.conf
@@ -18,16 +18,8 @@ main_sf() {
 	cd $root/
 
 	echo "Creating various etc/* files ..."
-	for x in $( cd $confdir ; echo etc_*.txt ) ; do
-		y="${x%.txt}" ; z="/"
-		if [ -f "${y//_/$z}" ]
-		then
-			echo "Found old ${y//_/$z} (don't overwrite)."
-			touch "${y//_/$z}"
-		else
-			cp -v "$confdir/$x" "${y//_/$z}"
-		fi
-	done
+	overlay_apply -n "$confdir/overlay.d"
+
 	[ -f etc/HOSTNAME ] || echo localhost > etc/HOSTNAME
 	chmod +x etc/initscript etc/rc.d/rc