diff --git a/packages/sysutils/upower/meta b/packages/sysutils/upower/meta
index d54c5ca0e4..87dbe09a7e 100644
--- a/packages/sysutils/upower/meta
+++ b/packages/sysutils/upower/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://upower.freedesktop.org/"
 PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="systemd glib dbus dbus-glib polkit pm-utils"
-PKG_BUILD_DEPENDS="toolchain systemd glib dbus dbus-glib gobject-introspection polkit"
+PKG_DEPENDS="systemd glib dbus dbus-glib polkit pm-utils libusb"
+PKG_BUILD_DEPENDS="toolchain systemd glib dbus dbus-glib gobject-introspection polkit libusb"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
 PKG_SHORTDESC="upower: a modular hardware abstraction layer designed for use in Linux systems that is designed to simplify device management."
diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf
index a870932b9e..bd16a7760a 100644
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@@ -1712,7 +1712,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf
index 580680bd48..489028f0ef 100644
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
@@ -1945,7 +1945,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf
index 1808531cb7..6841d246be 100644
--- a/projects/Fusion/linux/linux.x86_64.conf
+++ b/projects/Fusion/linux/linux.x86_64.conf
@@ -1894,7 +1894,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index 63e1dcb757..fe23cb94db 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -2029,7 +2029,7 @@ CONFIG_LPC_SCH=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf
index f7c27d37e1..a18cb086e4 100644
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/projects/Generic_OSS/linux/linux.i386.conf
@@ -2027,7 +2027,7 @@ CONFIG_LPC_SCH=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf
index 9f6aae5231..a861491aaf 100644
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@@ -1900,7 +1900,7 @@ CONFIG_LPC_SCH=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index 750043d98f..c2901c2fe2 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -1835,7 +1835,7 @@ CONFIG_LPC_SCH=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf
index 8bd21178b2..a70a8c9ce5 100644
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@@ -1917,7 +1917,7 @@ CONFIG_LPC_SCH=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf
index b2dbeddb61..872a6e2fcb 100644
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@@ -1853,7 +1853,7 @@ CONFIG_LPC_SCH=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf
index 3a44039a02..d89106f472 100644
--- a/projects/RPi/linux/linux.arm.conf
+++ b/projects/RPi/linux/linux.arm.conf
@@ -1319,7 +1319,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf
index 182f53b848..2c90181d6f 100644
--- a/projects/Ultra/linux/linux.x86_64.conf
+++ b/projects/Ultra/linux/linux.x86_64.conf
@@ -1755,7 +1755,7 @@ CONFIG_LPC_SCH=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf
index 69ddf7b801..c2b6a0379c 100644
--- a/projects/Virtual/linux/linux.i386.conf
+++ b/projects/Virtual/linux/linux.i386.conf
@@ -1919,7 +1919,7 @@ CONFIG_LPC_SCH=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf
index 30220fea1e..a983a95de5 100644
--- a/projects/Virtual/linux/linux.x86_64.conf
+++ b/projects/Virtual/linux/linux.x86_64.conf
@@ -1854,7 +1854,7 @@ CONFIG_LPC_SCH=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support