diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index fa83d91c06..4e441915f1 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -38,6 +38,7 @@ define KernelPackage/usb-gadget
   KCONFIG:=CONFIG_USB_GADGET
   FILES:=
   AUTOLOAD:=
+  DEPENDS:=@USB_GADGET_SUPPORT
   $(call AddDepends/usb)
 endef
 
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 63809c496d..7902dec3ef 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -158,6 +158,7 @@ sub target_config_features(@) {
 		/pci/ and $ret .= "\tselect PCI_SUPPORT\n";
 		/pcie/ and $ret .= "\tselect PCIE_SUPPORT\n";
 		/usb/ and $ret .= "\tselect USB_SUPPORT\n";
+		/usbgadget/ and $ret .= "\tselect USB_GADGET_SUPPORT\n";
 		/pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
 		/squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
 		/jffs2/ and $ret .= "\tselect USES_JFFS2\n";
diff --git a/target/Config.in b/target/Config.in
index 48fd827326..21cc3a476f 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -34,6 +34,9 @@ config USB_SUPPORT
 	select AUDIO_SUPPORT
 	bool
 
+config USB_GADGET_SUPPORT
+	bool
+
 config BIG_ENDIAN
 	bool
 
diff --git a/target/linux/omap24xx/Makefile b/target/linux/omap24xx/Makefile
index 81b59a822b..901d24b5d1 100644
--- a/target/linux/omap24xx/Makefile
+++ b/target/linux/omap24xx/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=omap24xx
 BOARDNAME:=TI OMAP-24xx
-FEATURES:=squashfs jffs2
+FEATURES:=squashfs jffs2 usb usbgadget
 
 LINUX_VERSION:=2.6.35.3