diff --git a/biosdevname.changes b/biosdevname.changes
index 4ed5eeb..4d15897 100644
--- a/biosdevname.changes
+++ b/biosdevname.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 12 19:33:10 CEST 2013 - ohering@suse.de
+
+- Update mkinitrd helper to look for rules in /lib and /usr/lib (bnc#820216)
+
 -------------------------------------------------------------------
 Mon Apr 22 12:08:57 UTC 2013 - idonmez@suse.com
 
diff --git a/setup-biosdevname.sh b/setup-biosdevname.sh
index b201df7..5f6c89e 100644
--- a/setup-biosdevname.sh
+++ b/setup-biosdevname.sh
@@ -19,15 +19,19 @@
 #%provides: biosdevname
 
 #
-# copy biosdevname binary
+# the binary location must match location used in udev rule
 cp_bin /sbin/biosdevname "${tmp_mnt}/sbin/biosdevname"
 
-#
-# copy udev rules
-if ! [ -d "${tmp_mnt}/etc/udev/rules.d" ] ; then
-    mkdir -p "${tmp_mnt}/etc/udev/rules.d"
-fi
-cp /lib/udev/rules.d/*-biosdevname.rules "${tmp_mnt}/etc/udev/rules.d"
+mkdir -p "${tmp_mnt}/etc/udev/rules.d"
+for i in \
+    /usr/lib/udev/rules.d/*-biosdevname.rules \
+    /lib/udev/rules.d/*-biosdevname.rules
+do
+    if test -f "$i"
+    then
+        cp --remove-destination "$i" "${tmp_mnt}/etc/udev/rules.d"
+    fi
+done
 
 
 # vim: set sw=4 ts=4 et: