diff --git a/.cvsignore b/.cvsignore
index 6d38f6f..d9e0822 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 hplip-0.9.3.tar.gz
 hplip-0.9.4.tar.gz
 hplip-0.9.5.tar.gz
+hplip-0.9.6.tar.gz
diff --git a/hplip.spec b/hplip.spec
index f54b581..5ca4855 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,17 +1,15 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 0.9.5
-Release: 3
+Version: 0.9.6
+Release: 2
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
 
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
-Patch1: hplip-compile.patch
 Patch2: hplip-desktop.patch
 Patch3: hplip-config.patch
-Patch4: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/hplip-0.9.5-2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -53,24 +51,19 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
-# Fix compile errors.
-%patch1 -p1 -b .compile
-
 # Use /usr/share/applications for putting desktop files in.
 %patch2 -p1 -b .desktop
 
 # Use static IP ports (for SELinux policy).
 %patch3 -p1 -b .config
 
-# Apply upstream patch to fix scanning in LaserJets and parallel InkJets.
-%patch4 -p1 -b .config
-
 %build
 %configure
 make
 
 %install
 rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_bindir}
 make install DESTDIR=%{buildroot}
 
 # Move SANE backend into correct directory
@@ -145,6 +138,9 @@ if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
 fi
 
 %changelog
+* Wed Oct 12 2005 Tim Waugh <twaugh@redhat.com> 0.9.6-2
+- 0.9.6.
+
 * Tue Sep 20 2005 Tim Waugh <twaugh@redhat.com> 0.9.5-3
 - Apply upstream patch to fix scanning in LaserJets and parallel InkJets.
 
diff --git a/sources b/sources
index a875718..baa2267 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb71d665ff935129029c78148b2b0c23  hplip-0.9.5.tar.gz
+a95d8087198e16dde758332b612fb112  hplip-0.9.6.tar.gz