diff --git a/Makefile b/Makefile
index 583701a6..37ba676d 100755
--- a/Makefile
+++ b/Makefile
@@ -220,7 +220,6 @@ include make/flash-updates.mk
 include make/flash-images.mk
 include make/linux-kernel.mk
 include make/target-blobs.mk
-include make/target-files.mk
 include make/target-libs-static.mk
 include make/target-rootfs.mk
 include make/host-tools.mk
diff --git a/make/ni.mk b/make/ni.mk
index e30722bc..dc87cb2b 100644
--- a/make/ni.mk
+++ b/make/ni.mk
@@ -78,8 +78,8 @@ ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2 hd5x hd6x vusolo4k vuduo4k vuduo4ks
   endif
 endif
 	make autofs
-	make files-etc
-	make files-var-etc
+	make sysconfdir
+	make sysconfdir-var
 	make init-scripts
 ifeq ($(PERSONALIZE),yes)
 	make personalize
diff --git a/skel-root/general/files-etc/filesystems b/package/sysconfdir/files/filesystems
similarity index 100%
rename from skel-root/general/files-etc/filesystems
rename to package/sysconfdir/files/filesystems
diff --git a/skel-root/general/files-etc/fstab b/package/sysconfdir/files/fstab
similarity index 100%
rename from skel-root/general/files-etc/fstab
rename to package/sysconfdir/files/fstab
diff --git a/skel-root/general/files-etc/fstab-var b/package/sysconfdir/files/fstab-var
similarity index 100%
rename from skel-root/general/files-etc/fstab-var
rename to package/sysconfdir/files/fstab-var
diff --git a/skel-root/general/files-etc/group b/package/sysconfdir/files/group
similarity index 100%
rename from skel-root/general/files-etc/group
rename to package/sysconfdir/files/group
diff --git a/skel-root/general/files-etc/hosts b/package/sysconfdir/files/hosts
similarity index 100%
rename from skel-root/general/files-etc/hosts
rename to package/sysconfdir/files/hosts
diff --git a/skel-root/general/files-etc/issue.net b/package/sysconfdir/files/issue.net
similarity index 100%
rename from skel-root/general/files-etc/issue.net
rename to package/sysconfdir/files/issue.net
diff --git a/skel-root/general/files-etc/nsswitch.conf b/package/sysconfdir/files/nsswitch.conf
similarity index 100%
rename from skel-root/general/files-etc/nsswitch.conf
rename to package/sysconfdir/files/nsswitch.conf
diff --git a/skel-root/general/files-etc/passwd b/package/sysconfdir/files/passwd
similarity index 100%
rename from skel-root/general/files-etc/passwd
rename to package/sysconfdir/files/passwd
diff --git a/skel-root/general/files-etc/profile b/package/sysconfdir/files/profile
similarity index 100%
rename from skel-root/general/files-etc/profile
rename to package/sysconfdir/files/profile
diff --git a/skel-root/general/files-etc/profile.d/alias.sh b/package/sysconfdir/files/profile.d/alias.sh
similarity index 100%
rename from skel-root/general/files-etc/profile.d/alias.sh
rename to package/sysconfdir/files/profile.d/alias.sh
diff --git a/skel-root/general/files-etc/profile.d/term.sh b/package/sysconfdir/files/profile.d/term.sh
similarity index 100%
rename from skel-root/general/files-etc/profile.d/term.sh
rename to package/sysconfdir/files/profile.d/term.sh
diff --git a/skel-root/general/files-etc/profile.local b/package/sysconfdir/files/profile.local
similarity index 100%
rename from skel-root/general/files-etc/profile.local
rename to package/sysconfdir/files/profile.local
diff --git a/skel-root/general/files-etc/profile.local-var b/package/sysconfdir/files/profile.local-var
similarity index 100%
rename from skel-root/general/files-etc/profile.local-var
rename to package/sysconfdir/files/profile.local-var
diff --git a/skel-root/general/files-etc/protocols b/package/sysconfdir/files/protocols
similarity index 100%
rename from skel-root/general/files-etc/protocols
rename to package/sysconfdir/files/protocols
diff --git a/skel-root/general/files-etc/services b/package/sysconfdir/files/services
similarity index 100%
rename from skel-root/general/files-etc/services
rename to package/sysconfdir/files/services
diff --git a/make/target-files.mk b/package/sysconfdir/sysconfdir.mk
similarity index 55%
rename from make/target-files.mk
rename to package/sysconfdir/sysconfdir.mk
index 6d0a0a45..6fdc6a39 100644
--- a/make/target-files.mk
+++ b/package/sysconfdir/sysconfdir.mk
@@ -1,9 +1,12 @@
+################################################################################
 #
-# makefile to install system files
+# sysconfdir
 #
-# -----------------------------------------------------------------------------
+################################################################################
+
+SYSCONFDIR_FILES_DIR = $(PACKAGE_DIR)/sysconfdir/files
 
-files-etc: \
+sysconfdir: \
 	$(TARGET_sysconfdir)/date-dummy \
 	$(TARGET_sysconfdir)/filesystems \
 	$(TARGET_sysconfdir)/fstab \
@@ -27,59 +30,59 @@ $(TARGET_sysconfdir)/date-dummy:
 	echo "$(shell date +%Y)01010000" > $(@)
 
 $(TARGET_sysconfdir)/filesystems:
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/filesystems $(@)
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/filesystems $(@)
 
 $(TARGET_sysconfdir)/fstab:
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/fstab $(@)
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/fstab $(@)
 
 $(TARGET_sysconfdir)/group:
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/group $(@)
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/group $(@)
 
 $(TARGET_sysconfdir)/hosts:
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/hosts $(@)
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/hosts $(@)
 
 $(TARGET_sysconfdir)/issue.net:
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/issue.net $(@)
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/issue.net $(@)
 
 $(TARGET_sysconfdir)/model:
 	echo $(BOXMODEL) > $(@)
 
 $(TARGET_sysconfdir)/nsswitch.conf:
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/nsswitch.conf $(@)
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/nsswitch.conf $(@)
 
 $(TARGET_sysconfdir)/passwd:
 ifeq ($(PERSISTENT_VAR_PARTITION),yes)
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/passwd $(TARGET_localstatedir)/etc/passwd
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/passwd $(TARGET_localstatedir)/etc/passwd
 	ln -sf /var/etc/passwd $(@)
 else
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/passwd $(@)
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/passwd $(@)
 endif
 
 $(TARGET_sysconfdir)/profile:
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/profile $(@)
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/profile $(@)
 
 $(TARGET_sysconfdir)/profile.local:
 ifeq ($(PERSISTENT_VAR_PARTITION),yes)
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/profile.local-var $(TARGET_localstatedir)/etc/profile.local
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/profile.local-var $(TARGET_localstatedir)/etc/profile.local
 endif
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/profile.local $(@)
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/profile.local $(@)
 
 $(TARGET_sysconfdir)/profile.d:
-	$(foreach p,$(wildcard $(TARGET_FILES)/files-etc/profile.d/*.sh),\
+	$(foreach p,$(wildcard $(SYSCONFDIR_FILES_DIR)/profile.d/*.sh),\
 		$(INSTALL_DATA) -D $(p) $(TARGET_sysconfdir)/profile.d/$(notdir $(p))$(sep))
 
 $(TARGET_sysconfdir)/services:
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/services $(@)
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/services $(@)
 
 $(TARGET_sysconfdir)/protocols:
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/protocols $(@)
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/protocols $(@)
 
 # -----------------------------------------------------------------------------
 
-files-var-etc: \
+sysconfdir-var: \
 	$(TARGET_localstatedir)/etc/fstab
 
 # -----------------------------------------------------------------------------
 
 $(TARGET_localstatedir)/etc/fstab:
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/fstab-var $(@)
+	$(INSTALL_DATA) -D $(SYSCONFDIR_FILES_DIR)/fstab-var $(@)