diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 26f3054998554590bcd95e83fa3f8dd502e62e80..c0b17aa84115a4929f54e65fb103d43f153340a6 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -21,6 +21,9 @@ endif
 ifneq ($(CONFIG_PCMCIA),)
   FEATURES += pcmcia
 endif
+ifneq ($(CONFIG_VIDEO_DEV),)
+  FEATURES += video
+endif
 
 # remove duplicates
 FEATURES:=$(sort $(FEATURES))
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index d0975e01c720ce6d9779c27e973009cbccc98537..d644ce5f5ab435a19fbafd8e5420334928ae7663 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -229,6 +229,7 @@ $(eval $(call KernelPackage,softdog))
 define KernelPackage/videodev
   TITLE=Video4Linux support
   DESCRIPTION:=Kernel modules for Video4Linux support
+  DEPENDS:=@VIDEO_SUPPORT
   SUBMENU:=$(EMENU)
   KCONFIG:=$(CONFIG_VIDEO_DEV)
   FILES:=$(MODULES_DIR)/kernel/drivers/media/video/*.$(LINUX_KMOD_SUFFIX)
diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile
index 33f4ef0c47a8f8fbfdc328380dd8d6119efd7059..078759bf460e4d9e834554e2e5029872023931b0 100644
--- a/package/spca5xx/Makefile
+++ b/package/spca5xx/Makefile
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/spca5xx
   SUBMENU:=Other modules
-  DEPENDS:=kmod-usb-core kmod-videodev
+  DEPENDS:=kmod-usb-core kmod-videodev @VIDEO_SUPPORT
   TITLE:=Driver for SPCA5xx based USB cameras
   URL:=http://mxhaard.free.fr/
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index ded38058a4aec377e97cd82c5b93013edf74265b..963be3f3828250b441f2fce57cb1037eac3502f8 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -180,6 +180,7 @@ sub target_config_features(@) {
 		/usb/ and $ret .= "\tselect USB_SUPPORT\n";
 		/atm/ and $ret .= "\tselect ATM_SUPPORT\n";
 		/pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n";
+		/video/ and $ret .= "\tselect VIDEO_SUPPORT\n";
 		/squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
 		/jffs2/ and $ret .= "\tselect USES_JFFS2\n";
 		/ext2/ and $ret .= "\tselect USES_EXT2\n";