diff --git a/target/Config.in b/target/Config.in
index 7694a8e16b..88b4b0e36b 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -5,7 +5,7 @@ source "target/ext2/Config.in"
 source "target/jffs2/Config.in"
 source "target/squashfs/Config.in"
 source "target/tar/Config.in"
-source "target/device/Config.in"
-source "target/generic/Config.in"
 
 endmenu
+
+source "target/device/Config.in"
diff --git a/target/device/Config.in b/target/device/Config.in
index 7ad0e830b8..432f4d7a51 100644
--- a/target/device/Config.in
+++ b/target/device/Config.in
@@ -2,4 +2,7 @@ menu "Board Support Options"
 
 source "target/device/Soekris/Config.in"
 
+# This must be last
+source "target/generic/Config.in"
+
 endmenu