diff --git a/Config.in b/Config.in
index dab7787..cce4619 100644
--- a/Config.in
+++ b/Config.in
@@ -419,7 +419,7 @@ endmenu
 
 source "toolchain/Config.in"
 
-source "target/generic/Config.in"
+source "system/Config.in"
 
 source "package/Config.in"
 
diff --git a/Makefile b/Makefile
index 9e1bcfd..791fd72 100644
--- a/Makefile
+++ b/Makefile
@@ -329,6 +329,7 @@ TARGETS+=target-generatelocales
 endif
 endif
 
+include system/system.mk
 include fs/common.mk
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
diff --git a/target/generic/Config.in b/system/Config.in
similarity index 99%
rename from target/generic/Config.in
rename to system/Config.in
index b8472f4..c30c6f7 100644
--- a/target/generic/Config.in
+++ b/system/Config.in
@@ -111,7 +111,7 @@ endchoice
 if BR2_ROOTFS_SKELETON_CUSTOM
 config BR2_ROOTFS_SKELETON_CUSTOM_PATH
 	string "custom target skeleton path"
-	default "fs/skeleton"
+	default "system/skeleton"
 	help
 	  Path custom target skeleton.
 endif