diff --git a/create_hal_global_fdi_from_hpmud_rules b/create_hal_global_fdi_from_hpmud_rules
index 07bc9ce..36a0425 100644
--- a/create_hal_global_fdi_from_hpmud_rules
+++ b/create_hal_global_fdi_from_hpmud_rules
@@ -42,9 +42,9 @@ echo '  <device>'
 exec <$TMP_DATA
 while read PRODUCT
 do echo
-   echo '    <match key="info.subsystem" string="usb_device">'
-   echo '      <match key="usb_device.vendor_id" int="0x03f0">'
-   echo -n '        <match key="usb_device.product_id" int="'
+   echo '    <match key="info.subsystem" string="usb">'
+   echo '      <match key="usb.vendor_id" int="0x03f0">'
+   echo -n '        <match key="usb.product_id" int="'
    echo -n "$PRODUCT"
    echo '">'
    echo '          <append key="info.capabilities" type="strlist">scanner</append>'
diff --git a/hplip.changes b/hplip.changes
index 41fe52b..6a9834d 100644
--- a/hplip.changes
+++ b/hplip.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec  3 17:30:47 CET 2008 - lnussel@suse.de
+
+- use "usb" instead of "usb_device" (bnc#438867)
+
 -------------------------------------------------------------------
 Wed Dec  3 11:18:55 CET 2008 - jsmeix@suse.de
 
diff --git a/hplip.spec b/hplip.spec
index 5754047..4fccb35 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -25,7 +25,7 @@ Summary:        HP's Printing, Scanning, and Faxing Software
 # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
 # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
 Version:        2.8.7
-Release:        5
+Release:        6
 Group:          Hardware/Printing
 License:        BSD 3-Clause; GPL v2 or later; X11/MIT
 Url:            http://hpinkjet.sourceforge.net/
@@ -483,6 +483,8 @@ exit 0
 %{_libdir}/libhpmud.*
 
 %changelog
+* Wed Dec 03 2008 lnussel@suse.de
+- use "usb" instead of "usb_device" (bnc#438867)
 * Wed Dec 03 2008 jsmeix@suse.de
 - Moved /etc/hal/fdi/policy/10osvendor/70-hpmud.fdi
   to /usr/share/hal/fdi/information/20thirdparty/70-hpmud.fdi