diff --git a/sane-backends-1.0.18-tweak-udev-rules.patch b/sane-backends-1.0.18-udev-098.patch
similarity index 99%
rename from sane-backends-1.0.18-tweak-udev-rules.patch
rename to sane-backends-1.0.18-udev-098.patch
index ca5eb25..37b3fb7 100644
--- a/sane-backends-1.0.18-tweak-udev-rules.patch
+++ b/sane-backends-1.0.18-udev-098.patch
@@ -1,7 +1,7 @@
---- sane-backends-1.0.18/tools/udev/libsane.rules.tweak-udev-rules	2007-07-05 17:19:11.000000000 +0200
-+++ sane-backends-1.0.18/tools/udev/libsane.rules	2007-07-05 17:21:02.000000000 +0200
+--- sane-backends-1.0.18/tools/udev/libsane.rules.udev-098	2007-07-20 17:24:49.000000000 +0200
++++ sane-backends-1.0.18/tools/udev/libsane.rules	2007-07-20 17:26:11.000000000 +0200
 @@ -18,1048 +18,1048 @@ ACTION!="add", GOTO="libsane_rules_end"
- SUBSYSTEM!="usb_device", GOTO="libsane_rules_end"
+ SUBSYSTEM!="usb|usb_device", GOTO="libsane_rules_end"
  
  # Hewlett-Packard ScanJet 4100C
 -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0101", MODE="660", GROUP="scanner"
diff --git a/sane-backends-1.0.18-udev-new-kernels.patch b/sane-backends-1.0.18-udev-new-kernels.patch
new file mode 100644
index 0000000..aad964c
--- /dev/null
+++ b/sane-backends-1.0.18-udev-new-kernels.patch
@@ -0,0 +1,11 @@
+--- sane-backends-1.0.18/tools/udev/libsane.rules.udev-new-kernels	2006-07-03 00:29:29.000000000 +0200
++++ sane-backends-1.0.18/tools/udev/libsane.rules	2007-07-20 17:24:49.000000000 +0200
+@@ -15,7 +15,7 @@
+ #
+ 
+ ACTION!="add", GOTO="libsane_rules_end"
+-SUBSYSTEM!="usb_device", GOTO="libsane_rules_end"
++SUBSYSTEM!="usb|usb_device", GOTO="libsane_rules_end"
+ 
+ # Hewlett-Packard ScanJet 4100C
+ SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0101", MODE="660", GROUP="scanner"
diff --git a/sane-backends.spec b/sane-backends.spec
index 12cc052..0e2d5c0 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -16,15 +16,15 @@
 %endif
 
 %if 0%{?fedora} >= 7 || 0%{?rhel} >= 6
-%define tweak_udev_rules 0%{?!_without_tweak_udev_rules:1}
+%define udev_098 0%{?!_without_udev_098:1}
 %else
-%define tweak_udev_rules 0%{?_with_tweak_udev_rules:1}
+%define udev_098 0%{?_with_udev_098:1}
 %endif
 
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.18
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -35,7 +35,8 @@ Patch3: sane-backends-multilib.patch
 Patch4: sane-backends-1.0.17-pkgconfig.patch
 Patch5: sane-backends-1.0.18-logical_vs_binary.patch
 Patch6: sane-backends-1.0.18-usb_reset.patch
-Patch7: sane-backends-1.0.18-tweak-udev-rules.patch
+Patch7: sane-backends-1.0.18-udev-new-kernels.patch
+Patch8: sane-backends-1.0.18-udev-098.patch
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
@@ -45,8 +46,8 @@ BuildRequires: gettext
 BuildRequires: gphoto2-devel
 %endif
 Requires: pam >= 0.78-2
-%if %tweak_udev_rules
-Requires: udev >= 106
+%if %udev_098
+Requires: udev >= 098
 %else
 Requires: udev
 %endif
@@ -121,14 +122,12 @@ want to access digital cameras.
 %patch4 -p1 -b .pkgconfig
 %patch5 -p1 -b .logical_vs_binary
 %patch6 -p1 -b .usb_reset
+%patch7 -p1 -b .udev-new-kernels
 
-%if %tweak_udev_rules
-%patch7 -p1 -b .tweak_udev_rules
+%if %udev_098
+%patch8 -p1 -b .udev-098
 %endif
 
-# Fix bug #62847.
-perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf
-
 for i in agfafocus avision coolscan2 umax_pp; do
 	iconv -f iso-8859-1 -t utf-8 < "doc/sane-$i.man" > "doc/sane-$i.man_"
 	mv "doc/sane-$i.man_" "doc/sane-$i.man"
@@ -247,6 +246,11 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Fri Jul 20 2007 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-9
+- don't tweak device names in device configuration files anymore (obsolete)
+- let udev rules cope with SUBSYSTEM=="usb" (#244444)
+- tweak-udev-rules patch is udev-098 patch now
+
 * Thu Jul 05 2007 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-8
 - tweak udev rules to conform with new udev syntax (#246849)