diff --git a/.gitignore b/.gitignore
index 64dd0dd..477a88e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ PackageKit-0.6.7.tar.bz2
 /PackageKit-0.6.9.tar.bz2
 /PackageKit-0.6.10.tar.bz2
 /PackageKit-0.6.11.tar.bz2
+/PackageKit-0.6.12.tar.bz2
diff --git a/PackageKit-0.6.11-yum-UTF-8.patch b/PackageKit-0.6.11-yum-UTF-8.patch
deleted file mode 100644
index f497d38..0000000
--- a/PackageKit-0.6.11-yum-UTF-8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/backends/yum/yumBackend.py
-+++ b/backends/yum/yumBackend.py
-@@ -999,8 +999,8 @@
-                 # yum >= 3.2.10
-                 # name = cat.nameByLang(self.lang)
-                 # summary = cat.descriptionByLang(self.lang)
--                name = cat.name
--                summary = cat.description
-+                name = _to_unicode(cat.name)
-+                summary = _to_unicode(cat.description)
-                 fn = "/usr/share/pixmaps/comps/%s.png" % cat_id
-                 if os.access(fn, os.R_OK):
-                     icon = cat_id
diff --git a/PackageKit.spec b/PackageKit.spec
index b1c584f..b8bdcb8 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -2,8 +2,8 @@
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   0.6.11
-Release:   5%{?dist}
+Version:   0.6.12
+Release:   1%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.bz2
@@ -14,13 +14,6 @@ Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
 # Fedora specific: the yum backend doesn't do time estimation correctly
 Patch1:    PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
 
-# From upstream:
-# http://gitorious.org/packagekit/packagekit/commit/7a92f842830e3ea9122463fe279f0b42150cbd63
-# yum: Ensure the category data is valid UTF8
-# fixes: [Bug 668282] PackageKit yum backend uses incorrect encoding for dynamic
-#        category names, makes them show up with '?' characters in KPackageKit
-Patch100:  PackageKit-0.6.11-yum-UTF-8.patch
-
 Requires: PackageKit-glib = %{version}-%{release}
 Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
@@ -252,7 +245,6 @@ user to restart the computer or remove and re-insert the device.
 %setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
-%patch100 -p1 -b .yum-UTF-8
 
 %build
 %configure \
@@ -463,6 +455,14 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Tue Feb 01 2011 Richard Hughes  <rhughes@redhat.com> - 0.6.12-1
+- New upstream release.
+- Do not attempt to call yum.repos twice when using RHN
+- Do not block the update list on infrastructure packages
+- Update the cached comps group list when changing repos.
+- Do not enable command not found debugging by default.
+- Resolves #666254, #629049
+
 * Fri Jan 21 2011 Christopher Aillon <caillon@redhat.com> - 0.6.11-5
 - Rebuild
 
diff --git a/sources b/sources
index 01589f5..8f5767a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74fffc6dc255973fc4d28881577e5c89  PackageKit-0.6.11.tar.bz2
+9ffcda702aba3334d5799e7698e29abb  PackageKit-0.6.12.tar.bz2