diff --git a/.cvsignore b/.cvsignore
index 05a2628..0273145 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -21,3 +21,4 @@ hplip-2.7.9.tar.gz
 hplip-2.7.10.tar.gz
 hplip-2.7.12.tar.gz
 hplip-2.8.2.tar.gz
+hplip-2.8.5.tar.gz
diff --git a/hplip-desktop.patch b/hplip-desktop.patch
index 04be02c..482d0e8 100644
--- a/hplip-desktop.patch
+++ b/hplip-desktop.patch
@@ -1,15 +1,10 @@
---- hplip-2.7.7/hplip.desktop.in.desktop	2007-08-01 22:00:39.000000000 +0100
-+++ hplip-2.7.7/hplip.desktop.in	2007-08-04 09:13:48.000000000 +0100
-@@ -1,10 +1,10 @@
+diff -up hplip-2.8.5/hplip.desktop.in.desktop hplip-2.8.5/hplip.desktop.in
+--- hplip-2.8.5/hplip.desktop.in.desktop	2008-05-08 17:26:03.000000000 +0100
++++ hplip-2.8.5/hplip.desktop.in	2008-06-03 12:03:18.000000000 +0100
+@@ -1,5 +1,5 @@
  [Desktop Entry]
 -Version=0.6
 +Encoding=UTF-8
  Type=Application
  Name=HP Device Manager
- GenericName=HP Device Manager
- Comment=View device status, ink levels and perform maintenance.
--Exec=@abs_datadir@/hplip/toolbox.py
-+Exec=@bindir@/hp-toolbox
- Icon=@abs_datadir@/hplip/data/images/HPmenu.png
- Terminal=false
- Categories=Application;Utility;
+ GenericName=Printer Management Application
diff --git a/hplip-quiet.patch b/hplip-quiet.patch
index 6f5cbec..718cfd7 100644
--- a/hplip-quiet.patch
+++ b/hplip-quiet.patch
@@ -1,11 +1,9 @@
---- hplip-2.7.6/hpssd.py.quiet	2007-06-01 00:23:37.000000000 +0100
-+++ hplip-2.7.6/hpssd.py	2007-06-29 14:06:25.000000000 +0100
-@@ -656,8 +656,6 @@
-                 usage()
+diff -up hplip-2.8.5/hpssd.py.quiet hplip-2.8.5/hpssd.py
+--- hplip-2.8.5/hpssd.py.quiet	2008-05-08 17:26:03.000000000 +0100
++++ hplip-2.8.5/hpssd.py	2008-06-03 12:07:23.000000000 +0100
+@@ -495,5 +495,4 @@ if __name__ == '__main__':
+             sys.exit(0)
  
  
--    utils.log_title(__title__, __version__)
--
-     prop.history_size = 100
- 
-     if prop.daemonize:
+-    utils.log_title(__title__, __version__)    
+     sys.exit(run())
diff --git a/hplip.spec b/hplip.spec
index ac488a5..1a78c16 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 2.8.2
-Release: 3%{?dist}
+Version: 2.8.5
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -42,8 +42,8 @@ BuildRequires: libjpeg-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libusb-devel
 BuildRequires: openssl-devel
-BuildRequires: autoconf
 BuildRequires: sane-backends-devel
+BuildRequires: dbus-devel
 
 %description
 The Hewlett-Packard Linux Imaging and Printing Project provides
@@ -116,12 +116,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
 %patch13 -p1 -b .ui-optional
 
-autoconf # for patch4
-
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
-	--disable-foomatic-rip-hplip-install
+	--disable-foomatic-rip-hplip-install --enable-dbus
 make hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
 
 %install
@@ -157,13 +155,17 @@ mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor
 install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
 
 # Images in docdir should not be executable (bug #440552).
-chmod 644 doc/images/*
+find doc/images -type f -exec chmod 644 {} \;
 
 # Remove files we don't want to package.
 rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc
 rm -f %{buildroot}%{_datadir}/hplip/hplip-install
 rm -rf %{buildroot}%{_datadir}/hplip/install.*
 
+# The systray applet doesn't work properly (displays icon as a
+# window), so don't ship the launcher yet.
+rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
+
 %clean
 rm -rf %{buildroot}
 
@@ -233,11 +235,13 @@ rm -rf %{buildroot}
 %files gui
 %{_bindir}/hp-check
 %{_bindir}/hp-print
+%{_bindir}/hp-systray
 %{_bindir}/hp-toolbox
 %{_datadir}/applications/*.desktop
 # Files
 %{_datadir}/hplip/check.py*
 %{_datadir}/hplip/print.py*
+%{_datadir}/hplip/systray.py*
 %{_datadir}/hplip/toolbox.py*
 # Directories
 %{_datadir}/hplip/data/images
@@ -251,6 +255,9 @@ rm -rf %{buildroot}
 %{_bindir}/hpijs
 %{_datadir}/foomatic/db/source/PPD/HP
 %{_datadir}/cups/drv/*
+# Note: this must be /usr/lib not %{_libdir}, since that's the
+# CUPS serverbin directory.
+/usr/lib/cups/filter/hplipjs
 
 %files -n libsane-hpaio
 %defattr(-,root,root)
@@ -278,6 +285,14 @@ fi
 exit 0
 
 %changelog
+* Tue Jun  3 2008 Tim Waugh <twaugh@redhat.com> 2.8.5-1
+- 2.8.5.
+- Configure with --enable-dbus.  Build requires dbus-devel.
+- Fix chmod 644 line.
+- Ship hp-systray in the gui sub-package, but don't ship the desktop
+  launcher yet as the systray applet is quite broken.
+- Don't run autoconf.
+
 * Tue May 13 2008 Tim Waugh <twaugh@redhat.com> 2.8.2-3
 - Move installer directory to main package (bug #446171).
 
diff --git a/sources b/sources
index 1a815c9..ab12b7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea57b92483622d3eae359994c5fd3dc3  hplip-2.8.2.tar.gz
+1f32fd8cc52669ef12b0df1a06ba8a56  hplip-2.8.5.tar.gz