diff --git a/.cvsignore b/.cvsignore
index edd59a8..e60aa13 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xsane-0.77.tar.gz
+xsane-0.82.tar.gz
diff --git a/sources b/sources
index 516138f..7893550 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d0902bd81d49bd523c15ffbb72d98aa  xsane-0.77.tar.gz
+dd36f72ce36c20cd8489d796d5f7c875  xsane-0.82.tar.gz
diff --git a/xsane.spec b/xsane.spec
index 0f0c16a..3748919 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -1,31 +1,34 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
-Version: 0.77
-Release: 4
+Version: 0.82
+Release: 3.1
 Source: http://www.xsane.org/download/%{name}-%{version}.tar.gz
+Patch0: xsane-0.82-sec.patch
+Patch1: xsane-0.82-if.patch
+Patch2: xsane-0.82-bytespp.patch
 License: GPL
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-buildroot
-Requires: sane-backends >= 1.0.5-3
-BuildPrereq: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
+Requires: sane
+BuildPrereq: sane-devel gimp-devel libpng-devel libjpeg-devel
 ExcludeArch: s390 s390x
 
 %description
 XSane is an X based interface for the SANE (Scanner Access Now Easy)
 library, which provides access to scanners, digital cameras, and other
-capture devices.  XSane is written in GTK+ and provides control for
+capture devices. XSane is written in GTK+ and provides control for
 performing the scan and then manipulating the captured image.
 
 %package gimp
 Summary: A GIMP plug-in which provides the SANE scanner interface.
 Group: Applications/Multimedia
-Requires: sane-backends >= 1.0
+Requires: sane >= 1.0
 Prereq: /usr/bin/gimp-config /usr/bin/awk sh-utils fileutils
 
 %description gimp
 This package provides the regular XSane frontend for the SANE scanner
-interface, but it works as a GIMP plug-in.  You must have GIMP
+interface, but it works as a GIMP plug-in. You must have GIMP
 installed to use this package.
 
 %prep
@@ -33,6 +36,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %setup -q
 
+# Fix an 'if (...); { ... }' construct.
+%patch0 -p1 -b .sec
+%patch1 -p1 -b .if
+%patch2 -p1 -b .bytespp
+
 %build
 %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1}
 %configure --with-install-root=%{buildroot}
@@ -93,11 +101,18 @@ fi
 
 %postun gimp
 if [ $1 = 0 ]; then
+  rm -f /usr/lib/gimp/1.2/plug-ins/xsane
   rm -f /usr/lib/gimp/1.1/plug-ins/xsane
   rm -f /usr/lib/gimp/1.0/plug-ins/xsane
 fi
 
 %changelog
+* Tue Dec 11 2001 Tim Waugh <twaugh@redhat.com> 0.82-3.1
+- 0.82.
+- Some extra patches from Oliver Rauch.
+- Require sane not sane-backends since it's available throughout 7.x.
+- Built for Red Hat Linux 7.1, 7.2.
+
 * Tue Jul 24 2001 Tim Waugh <twaugh@redhat.com> 0.77-4
 - Build requires libpng-devel, libjpeg-devel (#bug 49760).