diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 250a85ed84..eed1998d27 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -184,6 +184,7 @@ sub target_config_features(@) {
 		/mips16/ and $ret .= "\tselect HAS_MIPS16\n";
 		/rfkill/ and $ret .= "\tselect RFKILL_SUPPORT\n";
 		/low_mem/ and $ret .= "\tselect LOW_MEMORY_FOOTPRINT\n";
+		/nand/ and $ret .= "\tselect NAND_SUPPORT\n";
 	}
 	return $ret;
 }
diff --git a/target/Config.in b/target/Config.in
index e0320fac49..14dec6db4a 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -65,6 +65,7 @@ config USES_CPIOGZ
 
 config USES_UBIFS
 	bool
+	select NAND_SUPPORT
 
 config PROFILE_KCONFIG
 	bool
@@ -82,6 +83,9 @@ config HAS_MIPS16
 config RFKILL_SUPPORT
 	bool
 
+config NAND_SUPPORT
+	bool
+
 config ARCH_64BIT
 	bool
 
diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile
index 526ed2b09a..a4660c55e3 100644
--- a/target/linux/imx6/Makefile
+++ b/target/linux/imx6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=imx6
 BOARDNAME:=Freescale i.MX 6
-FEATURES:=audio display fpu gpio pcie rtc usb usbgadget squashfs targz ubifs
+FEATURES:=audio display fpu gpio pcie rtc usb usbgadget squashfs targz nand ubifs
 CPU_TYPE:=cortex-a9
 CPU_SUBTYPE:=neon
 MAINTAINER:=Luka Perkov <luka@openwrt.org>
diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile
index a14cf77eb3..aeceb13698 100644
--- a/target/linux/kirkwood/Makefile
+++ b/target/linux/kirkwood/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=kirkwood
 BOARDNAME:=Marvell Kirkwood
-FEATURES:=targz usb jffs2_nand ubifs
+FEATURES:=targz usb jffs2_nand nand ubifs
 CPU_TYPE:=xscale
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile
index 65839eb274..c59e9067de 100644
--- a/target/linux/lantiq/Makefile
+++ b/target/linux/lantiq/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 BOARD:=lantiq
 BOARDNAME:=Lantiq
-FEATURES:=squashfs ubifs
+FEATURES:=squashfs
 SUBTARGETS=xway xrx200
 
 LINUX_VERSION:=3.10.36
diff --git a/target/linux/lantiq/xrx200/target.mk b/target/linux/lantiq/xrx200/target.mk
index 0c646685a6..726f79b3c7 100644
--- a/target/linux/lantiq/xrx200/target.mk
+++ b/target/linux/lantiq/xrx200/target.mk
@@ -1,7 +1,7 @@
 ARCH:=mips
 SUBTARGET:=xrx200
 BOARDNAME:=XRX200
-FEATURES:=squashfs atm mips16 jffs2 ubifs
+FEATURES:=squashfs atm mips16 jffs2 nand ubifs
 CPU_TYPE:=34kc
 CPU_SUBTYPE:=dsp
 
diff --git a/target/linux/lantiq/xway/target.mk b/target/linux/lantiq/xway/target.mk
index 390eb2ac79..e8a287412b 100644
--- a/target/linux/lantiq/xway/target.mk
+++ b/target/linux/lantiq/xway/target.mk
@@ -1,7 +1,7 @@
 ARCH:=mips
 SUBTARGET:=xway
 BOARDNAME:=XWAY
-FEATURES:=squashfs atm mips16 jffs2_nand ubifs
+FEATURES:=squashfs atm mips16 jffs2_nand nand ubifs
 CPU_TYPE:=34kc
 CPU_SUBTYPE:=dsp
 
diff --git a/target/linux/omap/Makefile b/target/linux/omap/Makefile
index 3d0297ea94..5795c002d8 100644
--- a/target/linux/omap/Makefile
+++ b/target/linux/omap/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=omap
 BOARDNAME:=TI OMAP3/4/AM33xx
-FEATURES:=usb usbgadget ext4 targz fpu audio display ubifs
+FEATURES:=usb usbgadget ext4 targz fpu audio display nand ubifs
 CPU_TYPE:=cortex-a9
 CPU_SUBTYPE:=vfpv3
 
diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile
index 12ae8736cf..259ffb980f 100644
--- a/target/linux/xburst/Makefile
+++ b/target/linux/xburst/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=mipsel
 BOARD:=xburst
 BOARDNAME:=Ingenic XBurst
-FEATURES:=targz ubifs audio
+FEATURES:=targz nand ubifs audio
 SUBTARGETS:=qi_lb60 n516 n526 id800wt
 
 LINUX_VERSION:=3.10.36