diff --git a/target/Config.in b/target/Config.in
index 6ba3e43df6..a78a047a09 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -5,5 +5,6 @@ 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"
 
 endmenu
diff --git a/target/Makefile.in b/target/Makefile.in
index c01ade299a..d39bbb3e97 100644
--- a/target/Makefile.in
+++ b/target/Makefile.in
@@ -1 +1,5 @@
-# Nothing
+# Default target skeleton stuff, may be overridden
+TARGET_SKELETON:=target/default/skel.tar.gz
+TARGET_SKEL_DIR:=target/default/target_skeleton
+
+include target/device/Makefile.in
diff --git a/target/device/Config.in b/target/device/Config.in
new file mode 100644
index 0000000000..92be4b73d8
--- /dev/null
+++ b/target/device/Config.in
@@ -0,0 +1,5 @@
+menu "Board Support Options"
+
+source "target/device/generic/Config.in"
+
+endmenu
diff --git a/target/device/Makefile.in b/target/device/Makefile.in
new file mode 100644
index 0000000000..87a6801155
--- /dev/null
+++ b/target/device/Makefile.in
@@ -0,0 +1 @@
+-include target/device/*/Makefile.in
diff --git a/target/device/generic/Config.in b/target/device/generic/Config.in
new file mode 100644
index 0000000000..29127691f4
--- /dev/null
+++ b/target/device/generic/Config.in
@@ -0,0 +1,5 @@
+comment "Generic Device Support"
+
+source "target/device/generic/access_point/Config.in"
+source "target/device/generic/firewall/Config.in"
+
diff --git a/target/device/generic/access_point/Config.in b/target/device/generic/access_point/Config.in
new file mode 100644
index 0000000000..b0166d2f6d
--- /dev/null
+++ b/target/device/generic/access_point/Config.in
@@ -0,0 +1,6 @@
+config BR2_TARGET_GENERIC_ACCESS_POINT
+	bool "Generic wireless access point"
+	default n
+	help
+	  Board support for a generic wireless access point.
+
diff --git a/target/device/generic/firewall/Config.in b/target/device/generic/firewall/Config.in
new file mode 100644
index 0000000000..d20681b152
--- /dev/null
+++ b/target/device/generic/firewall/Config.in
@@ -0,0 +1,6 @@
+config BR2_TARGET_GENERIC_ACCESS_POINT
+	bool "Generic firewall"
+	default n
+	help
+	  Board support for a generic firewalling router.
+