diff --git a/.gitignore b/.gitignore
index 8a41461..2203965 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ PackageKit-0.6.7.tar.bz2
 /PackageKit-0.8.1.tar.xz
 /PackageKit-0.8.2.tar.xz
 /PackageKit-0.8.3.tar.xz
+/PackageKit-0.8.4.tar.xz
diff --git a/0001-yum-Work-around-a-yum-API-break-so-that-resolving-st.patch b/0001-yum-Work-around-a-yum-API-break-so-that-resolving-st.patch
deleted file mode 100644
index 9789902..0000000
--- a/0001-yum-Work-around-a-yum-API-break-so-that-resolving-st.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c817e88c5929c3a1448f47f6e16db86eef4fbf55 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Thu, 6 Sep 2012 09:09:19 +0100
-Subject: [PATCH] yum: Work around a yum API break so that resolving still
- works
-
-In e42ea3dc0b02ba73a11211de4062e87abfb77a6a yum changed the public API so that
-str(repo) returned 'fedora/18/i386' rather than just 'fedora'.
-This broke PackageKit pretty hard as the repo name is used in the package_id.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=854209
----
- backends/yum/yumBackend.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
-index 6117729..9da52bb 100755
---- a/backends/yum/yumBackend.py
-+++ b/backends/yum/yumBackend.py
-@@ -2599,7 +2599,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
- 
-     def _pkg_to_id(self, pkg):
-         pkgver = _get_package_ver(pkg)
--        repo = str(pkg.repo)
-+        repo = pkg.repo.id
-         if repo.startswith('/'):
-             repo = "local"
-         # can we add data from the yumdb
--- 
-1.7.11.4
-
diff --git a/PackageKit.spec b/PackageKit.spec
index 0562c65..4f67fe5 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -2,8 +2,8 @@
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   0.8.3
-Release:   3%{?dist}
+Version:   0.8.4
+Release:   1%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
@@ -17,9 +17,6 @@ Patch1:    PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
 # Upstreamable?  allow use of xulrunner2 for browser-plugin support
 Patch4: PackageKit-0.7.4-xulrunner2.patch
 
-# Upstream: work around an API break in yum
-Patch5: 0001-yum-Work-around-a-yum-API-break-so-that-resolving-st.patch
-
 Requires: %{name}-glib%{?_isa} = %{version}-%{release}
 Requires: PackageKit-backend
 Requires: shared-mime-info
@@ -257,7 +254,7 @@ user to restart the computer or remove and re-insert the device.
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
 %patch4 -p1 -b .xulrunner2
-%patch5 -p1 -b .yum-api-break
+
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -431,7 +428,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/gtk-2.0/modules/*.so
 %{_libdir}/gtk-3.0/modules/*.so
 %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/*.desktop
-%{_datadir}/glib-2.0/schemas/*.gschema.xml
 
 %files command-not-found
 %defattr(-,root,root,-)
@@ -464,12 +460,16 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %files backend-devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/PackageKit
-%dir %{_includedir}/PackageKit/backend
-%{_includedir}/PackageKit/backend/*.h
 %{_includedir}/PackageKit/plugin
 %{_libdir}/pkgconfig/packagekit-plugin.pc
 
 %changelog
+* Mon Oct 01 2012 Richard Hughes  <rhughes@redhat.com> - 0.8.4-1
+- New upstream release
+- Suggest a Linux binary if the Solaris name is used
+- Use pkttyagent to request user passwords if required
+- Ask PackageKit to quit when yum is started
+
 * Mon Sep 07 2012 Richard Hughes  <rhughes@redhat.com> - 0.8.3-3
 - Rework the manaully added requires so that PackageKit-glib doesn't
   pull in so many deps.
diff --git a/sources b/sources
index 75dd21a..d86bb8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53210d9a54d3c9044e4c6edc16c99bd4  PackageKit-0.8.3.tar.xz
+584932c90e4c0f7c55f2dd8ede1eb400  PackageKit-0.8.4.tar.xz