diff --git a/sane-frontends-1.0.14-array-out-of-bounds.patch b/sane-frontends-1.0.14-array-out-of-bounds.patch
new file mode 100644
index 0000000..f5c11a2
--- /dev/null
+++ b/sane-frontends-1.0.14-array-out-of-bounds.patch
@@ -0,0 +1,40 @@
+commit c4cb247732767aed76502069d0b3040c4c4e5123
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Fri Jul 31 16:21:53 2009 +0200
+
+    patch: array-out-of-bounds
+    
+    Squashed commit of the following:
+    
+    commit 337bcefaa7a67931095b74317a266a1244978ab6
+    Author: Nils Philippsen <nils@redhat.com>
+    Date:   Fri Jul 31 16:03:28 2009 +0200
+    
+        fix array subscript out of bounds errors (#133121)
+
+diff --git a/src/xcam.c b/src/xcam.c
+index 2d494a5..f6859b7 100644
+--- a/src/xcam.c
++++ b/src/xcam.c
+@@ -1289,7 +1289,7 @@ save_frame_button (GtkWidget * widget, gpointer client_data,
+ 
+       /* test for pnm formats */
+       strncpy (testfilename, preferences.filename, sizeof (testfilename));
+-      testfilename[sizeof (testfilename)] = 0;
++      testfilename[sizeof (testfilename) - 1] = 0;
+       g_strreverse (testfilename);
+       if (!((!strncmp (testfilename, "mnp.", 4)) ||
+ 	    (!strncmp (testfilename, "mgp.", 4)) ||
+diff --git a/src/xscanimage.c b/src/xscanimage.c
+index a36324f..065923d 100644
+--- a/src/xscanimage.c
++++ b/src/xscanimage.c
+@@ -1284,7 +1284,7 @@ scan_dialog (GtkWidget * widget, gpointer call_data)
+     {				/* We are running in standalone mode */
+       /* test for pnm formats */
+       strncpy (testfilename, preferences.filename, sizeof (testfilename));
+-      testfilename[sizeof (testfilename)] = 0;
++      testfilename[sizeof (testfilename) - 1] = 0;
+       g_strreverse (testfilename);
+       if (!((!strncmp (testfilename, "mnp.", 4)) ||
+ 	    (!strncmp (testfilename, "mgp.", 4)) ||
diff --git a/sane-frontends-1.0.14-badcode.patch b/sane-frontends-1.0.14-badcode.patch
deleted file mode 100644
index cd2a0fb..0000000
--- a/sane-frontends-1.0.14-badcode.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- sane-frontends-1.0.14/src/xscanimage.c.badcode	2005-11-21 15:29:15.000000000 +0100
-+++ sane-frontends-1.0.14/src/xscanimage.c	2005-11-21 15:33:32.000000000 +0100
-@@ -1284,7 +1284,7 @@
-     {				/* We are running in standalone mode */
-       /* test for pnm formats */
-       strncpy (testfilename, preferences.filename, sizeof (testfilename));
--      testfilename[sizeof (testfilename)] = 0;
-+      testfilename[sizeof (testfilename) - 1] = 0;
-       g_strreverse (testfilename);
-       if (!((!strncmp (testfilename, "mnp.", 4)) ||
- 	    (!strncmp (testfilename, "mgp.", 4)) ||
---- sane-frontends-1.0.14/src/xcam.c.badcode	2005-06-02 18:32:09.000000000 +0200
-+++ sane-frontends-1.0.14/src/xcam.c	2005-11-21 15:32:42.000000000 +0100
-@@ -1289,7 +1289,7 @@
- 
-       /* test for pnm formats */
-       strncpy (testfilename, preferences.filename, sizeof (testfilename));
--      testfilename[sizeof (testfilename)] = 0;
-+      testfilename[sizeof (testfilename) - 1] = 0;
-       g_strreverse (testfilename);
-       if (!((!strncmp (testfilename, "mnp.", 4)) ||
- 	    (!strncmp (testfilename, "mgp.", 4)) ||
diff --git a/sane-frontends-1.0.14-sane-backends-1.0.20.patch b/sane-frontends-1.0.14-sane-backends-1.0.20.patch
new file mode 100644
index 0000000..15bd6a1
--- /dev/null
+++ b/sane-frontends-1.0.14-sane-backends-1.0.20.patch
@@ -0,0 +1,31 @@
+commit ddd90b1502a263d03938b1e45a57684d576993ba
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Fri Jul 31 16:25:58 2009 +0200
+
+    patch: sane-backends-1.0.20
+    
+    Squashed commit of the following:
+    
+    commit 0c84326fa37bb309481c4d2658ab6cb17c9f0e85
+    Author: Nils Philippsen <nils@redhat.com>
+    Date:   Fri Jul 31 16:18:59 2009 +0200
+    
+        use SANE_CAP_ALWAYS_SETTABLE only if available
+
+diff --git a/src/gtkglue.c b/src/gtkglue.c
+index ba5cbf5..ec81f45 100644
+--- a/src/gtkglue.c
++++ b/src/gtkglue.c
+@@ -1476,8 +1476,12 @@ gsg_set_sensitivity (GSGDialog * dialog, int sensitive)
+ 	  || opt->type == SANE_TYPE_GROUP || !dialog->element[i].widget)
+ 	continue;
+ 
++#ifdef SANE_CAP_ALWAYS_SETTABLE
+       if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE))
+ 	gtk_widget_set_sensitive (dialog->element[i].widget, sensitive);
++#else
++	gtk_widget_set_sensitive (dialog->element[i].widget, sensitive);
++#endif
+     }
+ }
+ 
diff --git a/sane-frontends.spec b/sane-frontends.spec
index 6f31d47..c43801b 100644
--- a/sane-frontends.spec
+++ b/sane-frontends.spec
@@ -1,10 +1,11 @@
 Name: sane-frontends
 Version: 1.0.14
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Graphical frontend to SANE
-URL:       http://www.sane-project.org
-Source0:    ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
-Patch0: sane-frontends-1.0.14-badcode.patch
+URL: http://www.sane-project.org
+Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
+Patch0: sane-frontends-1.0.14-array-out-of-bounds.patch
+Patch1: sane-frontends-1.0.14-sane-backends-1.0.20.patch
 License: GPLv2+
 Group: Applications/System
 BuildRequires: gtk2-devel gimp-devel
@@ -20,7 +21,8 @@ This packages includes the scanadf and xcam programs.
 
 %prep
 %setup -q
-%patch0 -p1 -b .badcode
+%patch0 -p1 -b .array-out-of-bounds
+%patch1 -p1 -b .sane-backends-1.0.20
 
 %build
 %configure --with-gnu-ld --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir}
@@ -44,6 +46,10 @@ rm -R $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 31 2009 Nils Philippsen <nils@redhat.com> 1.0.14-8
+- replace badcode with array-out-of-bounds patch
+- fix compilation with sane-backends-1.0.20
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.14-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild