diff --git a/.cvsignore b/.cvsignore
index 6b5fb89..cb9cfd3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-plustek-sane-0.45-5.tar.gz
-sane-backends-1.0.8.tar.gz
+sane-backends-1.0.9.tar.gz
diff --git a/sane-backends.spec b/sane-backends.spec
index 7f8ae6e..d71d41b 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -1,16 +1,18 @@
 Summary: Scanner access software.
 Name: sane-backends
-Version: 1.0.8
-Release: 5.2
+Version: 1.0.9
+Release: 5
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.mostang.com/pub/sane/sane-%{version}/%{name}-%{version}.tar.gz
 Source1: sane.png
-Source2: plustek-sane-0.45-5.tar.gz
 Patch0: sane-sparc.patch
 Patch1: sane-backends-1.0.7-autoload.patch
 Patch2: sane-backends-1.0.8-rpath.patch
-Patch3: sane-backends-1.0.8-saned.patch
+Patch3: sane-backends-1.0.8-docdir.patch
+Patch4: sane-backends-1.0.9-errorchk.patch
+Patch5: sane-backends-1.0.9-hp101.patch
+Patch6: sane-backends-1.0.10-security.patch
 URL: http://www.mostang.com/sane/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: tetex-latex libusb-devel
@@ -52,7 +54,7 @@ Static libraries and header files for writing Scanner Access Now Easy
 included in the sane-backends package.
 
 %prep
-%setup -q -a 2
+%setup -q
 %patch0 -p1 -b .sparc
 
 # Make sure to load SCSI modules if not already loaded (bug #59979).
@@ -61,29 +63,37 @@ cd sanei
 cd ..
 
 %patch2 -p1 -b .rpath
-%patch3 -p1 -b .saned
+%patch3 -p1 -b .docdir
+%patch4 -p1 -b .errorchk
+%patch5 -p1 -b .hp101
+%patch6 -p1 -b .security
 
 # Fix bug #62847.
 perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf
 
+# We patched configure.in, so regenerate configure.
+autoconf
+
 %build
 %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1}
 %if %{gphoto2_support}
-%configure --with-gphoto2=/usr
+%configure --with-gphoto2=/usr --with-docdir=%{_docdir}/%{name}-%{version}
 %else
-%configure --without-gphoto2
+%configure --without-gphoto2 --with-docdir=%{_docdir}/%{name}-%{version}
 %endif
 make
 
 
 %install
 rm -rf %{buildroot}
-%{makeinstall}
+%{makeinstall} docdir=%{buildroot}/%{_docdir}/%{name}-%{version}
 perl -pi -e "s/installed.*/installed=yes/g" $RPM_BUILD_ROOT%{_libdir}/libsane.la
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/sane
 
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
+rm -f %{buildroot}%{_bindir}/gamma4scanimage
+
 
 %clean
 rm -rf %{buildroot}
@@ -113,20 +123,21 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc doc/icons doc/figs doc/*.man
-%doc AUTHORS NEWS PROBLEMS PROJECTS README
 %dir /etc/sane.d
 %config /etc/sane.d/*
-%{_bindir}/*
+%{_bindir}/sane-find-scanner
+%{_bindir}/scanimage
 %{_sbindir}/*
 %{_libdir}/libsane*.so.*
 %dir %{_libdir}/sane
 %{_libdir}/sane/*.so.*
 %{_mandir}/*/*
 %{_datadir}/pixmaps/sane.png
+%{_docdir}/*
 
 %files devel
 %defattr(-,root,root)
+%{_bindir}/sane-config
 %{_includedir}/sane
 %{_libdir}/libsane*.la
 %{_libdir}/libsane*.so
@@ -134,13 +145,26 @@ fi
 %{_libdir}/sane/*.so
 
 %changelog
-* Thu Sep 11 2003 Tim Waugh <twaugh@redhat.com> 1.0.8-5.2
-- Fix saned security issues.
+* Mon Feb 10 2003 Tim Waugh <twaugh@redhat.com> 1.0.9-5
+- Fix saned problems.
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 1.0.9-4
+- rebuilt
+
+* Thu Jan 16 2003 Tim Waugh <twaugh@redhat.com> 1.0.9-3
+- hp-backend 1.01 for 'error during device I/O' workaround (bug #81835).
+
+* Thu Jan  9 2003 Tim Waugh <twaugh@redhat.com> 1.0.9-2
+- Better error checking in the Canon backend (bug #81332).
+
+* Fri Oct 25 2002 Tim Waugh <twaugh@redhat.com> 1.0.9-1
+- 1.0.9.
 
-* Thu Jul 24 2003 Tim Waugh <twaugh@redhat.com> 1.0.8-5.1
-- Update plustek backend to 0.45-5 (bug #100659).
+* Wed Oct 23 2002 Tim Waugh <twaugh@redhat.com> 1.0.8-6
+- Ship the installed documentation.
+- Move sane-config to the devel subpackage (bug #68454).
 
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 1.0.8-5
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
 - automated rebuild
 
 * Fri Jun 21 2002 Tim Waugh <twaugh@redhat.com> 1.0.8-4
diff --git a/sources b/sources
index 5886a75..690d978 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ca8f7b1f7ee35b3c09caf0cb16dc6b88  plustek-sane-0.45-5.tar.gz
-10785bf9a87e0f45ad445e34a8529a3d  sane-backends-1.0.8.tar.gz
+b1869b7d333ab826b3aa9edde9820a96  sane-backends-1.0.9.tar.gz