diff --git a/Config.in b/Config.in
index 874c20abd1..ff77449524 100644
--- a/Config.in
+++ b/Config.in
@@ -334,6 +334,8 @@ endmenu
 
 source "toolchain/Config.in"
 
+source "target/generic/Config.in"
+
 source "package/Config.in"
 
 source "fs/Config.in"
diff --git a/target/generic/Config.in b/target/generic/Config.in
index 54ff1d6ba4..81ac011976 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -1,4 +1,4 @@
-if !(BR2_TARGET_ATMEL||BR2_TARGET_KWIKBYTE||BR2_TARGET_VALKA)
+menu "System configuration"
 
 config BR2_TARGET_GENERIC_HOSTNAME
        string "System hostname"
@@ -166,4 +166,4 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE
 
 endif # BR2_TARGET_GENERIC_GETTY
 
-endif
+endmenu