diff --git a/.cvsignore b/.cvsignore
index 4e9248e..ecb2bd7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-PackageKit-0.6.3.tar.bz2
+PackageKit-0.6.4.tar.bz2
diff --git a/PackageKit.spec b/PackageKit.spec
index 30fb2f6..6e44754 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -5,9 +5,9 @@
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   0.6.3
+Version:   0.6.4
 #Release:   0.1.%{?alphatag}git%{?dist}
-Release:   2%{?dist}
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
@@ -24,8 +24,6 @@ Patch1:    PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
 Patch2:    PackageKit-0.6.3-disable-zif.patch
 
 Requires: PackageKit-glib = %{version}-%{release}
-Requires: PackageKit-gtk-module = %{version}-%{release}
-Requires: PackageKit-yum-plugin = %{version}-%{release}
 Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
 Requires: comps-extras
@@ -39,7 +37,6 @@ BuildRequires: xmlto
 BuildRequires: sqlite-devel
 BuildRequires: NetworkManager-devel
 BuildRequires: polkit-devel >= 0.92
-#BuildRequires: polkit
 BuildRequires: libtool
 BuildRequires: docbook-utils
 BuildRequires: gnome-doc-utils
@@ -288,9 +285,6 @@ popd > /dev/null
 
 %find_lang %name
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
@@ -459,6 +453,15 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Thu May 06 2010 Richard Hughes  <rhughes@redhat.com> - 0.6.4-1
+- New upstream release of 0.6.4.
+- Catch exceptions.IOError whenever we do a low-level yum call. Resolves #577549
+- Do not abort if the package-id is not unique in the reposet
+- Ensure the lock failure message is proper unicode. Resolves #585620
+- Ensure we catch the exception if there are no groups. Resolves #587196
+- Ensure we create /var/cache/PackageKit if the user nukes it
+- Get the correct state for each update. Resolves #574658
+
 * Mon Mar 29 2010 Richard Hughes  <rhughes@redhat.com> - 0.6.3-1
 - New upstream version
 - Update to the latest version of the Fedora Packaging Guidelines
diff --git a/sources b/sources
index a2b3ec6..2f1094c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6eb8f09d319a02158a1bcac25468a63  PackageKit-0.6.3.tar.bz2
+f17127a26cb6dd7e8f05b8900176eab0  PackageKit-0.6.4.tar.bz2