diff --git a/sane-backends-1.0.24-hwdb.patch b/sane-backends-1.0.24-hwdb.patch
new file mode 100644
index 0000000..372012f
--- /dev/null
+++ b/sane-backends-1.0.24-hwdb.patch
@@ -0,0 +1,38 @@
+From 92c55802144a024fb48ca5babeb99254209d2c71 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Thu, 24 Oct 2013 14:29:25 +0200
+Subject: [PATCH] patch: hwdb
+
+Squashed commit of the following:
+
+commit 6686fded6523a04b26d02e7bbeb906a579c9ef5f
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Thu Oct 24 14:22:17 2013 +0200
+
+    sane-desc: fix udev hwdb generation
+
+    Generated hwdb files listed the vendor ID instead of the product ID
+    which made udevd not recognizing scanner devices as such. Thanks to
+    Fabrice Bellet who spotted the problem.
+
+    (cherry picked from commit 3b96baef65ea6c315937f5cd2253c6b6c62636d8)
+---
+ tools/sane-desc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/sane-desc.c b/tools/sane-desc.c
+index df6d348..ae218c3 100644
+--- a/tools/sane-desc.c
++++ b/tools/sane-desc.c
+@@ -3827,7 +3827,7 @@ print_hwdb (void)
+ 
+       for(j = 0; j < 4; j++) {
+         vendor_id[j] = toupper(vendor_id[j]);
+-        product_id[j] = toupper(vendor_id[j]);
++        product_id[j] = toupper(product_id[j]);
+       }
+ 
+       printf ("usb:v%sp%s*\n libsane_matched=yes\n\n",
+-- 
+1.8.3.1
+
diff --git a/sane-backends.spec b/sane-backends.spec
index d973e87..58292ff 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -37,7 +37,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.24
-Release: 2%{?dist}
+Release: 3%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -56,6 +56,8 @@ Patch1: sane-backends-1.0.21-epson-expression800.patch
 Patch2: sane-backends-1.0.23-soname.patch
 # Fedora-specific (for now): make installed sane-config multi-lib aware again
 Patch3: sane-backends-1.0.23-sane-config-multilib.patch
+# Upstream commit 3b96baef65ea6c315937f5cd2253c6b6c62636d8
+Patch4: sane-backends-1.0.24-hwdb.patch
 
 URL: http://www.sane-project.org
 
@@ -168,6 +170,7 @@ This package contains backend drivers to access digital cameras through SANE.
 %patch1 -p1 -b .epson-expression800
 %patch2 -p1 -b .soname
 %patch3 -p1 -b .sane-config-multilib
+%patch4 -p1 -b .hwdb
 
 %build
 CFLAGS="%optflags -fno-strict-aliasing"
@@ -289,6 +292,9 @@ udevadm hwdb --update >/dev/null 2>&1 || :
 %{_libdir}/sane/*gphoto2.so*
 
 %changelog
+* Thu Oct 24 2013 Nils Philippsen <nils@redhat.com> - 1.0.24-3
+- generate hwdb files correctly (#1018565)
+
 * Wed Oct 16 2013 Nils Philippsen <nils@redhat.com> - 1.0.24-2
 - update udev hwdb on installation/removal