diff --git a/packages/linux-drivers/AF9035/install b/packages/linux-drivers/AF9035/install
index 8d14198583..343e55d80c 100755
--- a/packages/linux-drivers/AF9035/install
+++ b/packages/linux-drivers/AF9035/install
@@ -29,5 +29,5 @@ mkdir -p $INSTALL/lib/modules/$VER/AF9035
   cp $PKG_BUILD/tua9001.ko $INSTALL/lib/modules/$VER/AF9035
   cp $PKG_BUILD/af9033.ko $INSTALL/lib/modules/$VER/AF9035
 
-mkdir -p $INSTALL/lib/firmware
-  cp $PKG_DIR/firmware/*.fw $INSTALL/lib/firmware
+mkdir -p $INSTALL/usr/lib/firmware
+  cp $PKG_DIR/firmware/*.fw $INSTALL/usr/lib/firmware
diff --git a/packages/linux-firmware/dvb-firmware/install b/packages/linux-firmware/dvb-firmware/install
index e15be287d7..1f73289b6e 100755
--- a/packages/linux-firmware/dvb-firmware/install
+++ b/packages/linux-firmware/dvb-firmware/install
@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL
-  cp -PR $PKG_BUILD/.install/* $INSTALL
+mkdir -p $INSTALL/usr
+  cp -PR $PKG_BUILD/.install/* $INSTALL/usr
diff --git a/packages/linux-firmware/misc-firmware/install b/packages/linux-firmware/misc-firmware/install
index e15be287d7..1f73289b6e 100755
--- a/packages/linux-firmware/misc-firmware/install
+++ b/packages/linux-firmware/misc-firmware/install
@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL
-  cp -PR $PKG_BUILD/.install/* $INSTALL
+mkdir -p $INSTALL/usr
+  cp -PR $PKG_BUILD/.install/* $INSTALL/usr
diff --git a/packages/linux-firmware/wlan-firmware/install b/packages/linux-firmware/wlan-firmware/install
index e15be287d7..1f73289b6e 100755
--- a/packages/linux-firmware/wlan-firmware/install
+++ b/packages/linux-firmware/wlan-firmware/install
@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL
-  cp -PR $PKG_BUILD/.install/* $INSTALL
+mkdir -p $INSTALL/usr
+  cp -PR $PKG_BUILD/.install/* $INSTALL/usr
diff --git a/packages/linux/install b/packages/linux/install
index 3164ccfa44..5a035d03af 100755
--- a/packages/linux/install
+++ b/packages/linux/install
@@ -31,9 +31,9 @@ mkdir -p $INSTALL/lib/modules/$VER
   rm -f $INSTALL/lib/modules/$VER/modules.*
 
 # copy kernel firmwares (if present and requested)
-  mkdir -p $INSTALL/lib/firmware
+  mkdir -p $INSTALL/usr/lib/firmware
   [ -d $PKG_BUILD/modules/lib/firmware ] && \
-    cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true
+    cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/usr/lib/firmware || true
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/modules $INSTALL/etc
diff --git a/packages/multimedia/crystalhd/install b/packages/multimedia/crystalhd/install
index 15caef385c..de76e3536b 100755
--- a/packages/multimedia/crystalhd/install
+++ b/packages/multimedia/crystalhd/install
@@ -24,8 +24,8 @@
 
 VER=`ls $BUILD/linux*/modules/lib/modules`
 
-mkdir -p $INSTALL/lib/firmware
-  cp $PKG_BUILD/firmware/fwbin/*/*.bin $INSTALL/lib/firmware
+mkdir -p $INSTALL/usr/lib/firmware
+  cp $PKG_BUILD/firmware/fwbin/*/*.bin $INSTALL/usr/lib/firmware
 
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/linux_lib/libcrystalhd/*.so* $INSTALL/usr/lib
diff --git a/packages/sysutils/udev/build b/packages/sysutils/udev/build
index a27286425b..1c503aaee6 100755
--- a/packages/sysutils/udev/build
+++ b/packages/sysutils/udev/build
@@ -53,7 +53,7 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
             --disable-edd \
             --without-selinux \
             --without-systemdsystemunitdir \
-            --with-firmware-path=/lib/firmware \
+            --with-firmware-path="/storage/.config/firmware:/usr/lib/firmware" \
             --with-pci-ids-path=/usr/share/pci.ids \
             --with-usb-ids-path=/usr/share/usb.ids \
             --with-gnu-ld \