diff --git a/python-virtinst.spec b/python-virtinst.spec
index 5fe3a8d..100ce34 100644
--- a/python-virtinst.spec
+++ b/python-virtinst.spec
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.500.3
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 # Fix --cdrom with media manually added to pool (bz 574973)
 Patch1: %{appname}-%{version}-virtualdisk-refresh.patch
@@ -25,14 +25,10 @@ Patch1: %{appname}-%{version}-virtualdisk-refresh.patch
 Patch2: %{appname}-%{version}-seclabel-comma.patch
 # virt-install: Fix --location dvd.iso (bz 587679)
 Patch3: %{appname}-%{version}-location-cdrom.patch
-# Enable x2apic for new KVM guests
-Patch4: %{appname}-%{version}-use-x2apic.patch
 # Keep windows CDROM attached for second install stage
-Patch5: %{appname}-%{version}-fix-windows-cdrom.patch
+Patch4: %{appname}-%{version}-fix-windows-cdrom.patch
 # Fix pool source listing in virt-manager
-Patch6: %{appname}-%{version}-poolsource-check.patch
-# If host is 64bit, make sure VM always sees 64bit CPU (bz 611584)
-Patch7: %{appname}-%{version}-64bit-flag.patch
+Patch5: %{appname}-%{version}-poolsource-check.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -65,8 +61,6 @@ and install new VMs) and virt-clone (clone an existing virtual machine).
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 python setup.py build
@@ -102,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Wed Jul 14 2010 Cole Robinson <crobinso@redhat.com> - 0.500.3-4.fc13
+- Drop default CPU config, fix some 64bit installs (bz 611584)
+
 * Wed Jul 14 2010 Cole Robinson <crobinso@redhat.com> - 0.500.3-3.fc13
 - If host is 64bit, make sure VM always sees 64bit CPU (bz 611584)
 
diff --git a/virtinst-0.500.3-64bit-flag.patch b/virtinst-0.500.3-64bit-flag.patch
deleted file mode 100644
index 2a4c543..0000000
--- a/virtinst-0.500.3-64bit-flag.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -rup virtinst-0.500.3/virtinst/Guest.py new/virtinst/Guest.py
---- virtinst-0.500.3/virtinst/Guest.py	2010-07-14 15:52:03.137472000 -0400
-+++ new/virtinst/Guest.py	2010-07-14 15:51:56.729949000 -0400
-@@ -728,6 +728,12 @@ class Guest(object):
-             xml += "  <cpu match='exact'>\n"
-             xml += "    <model>%s</model>\n" % model
-             xml += "    <feature policy='force' name='x2apic'/>\n"
-+
-+            # If capabilities lists the 'lm' (64 bit) feature, we need
-+            # to carry it over otherwise the guest will only see a 32bit cpu
-+            if self._caps.host.cpu.features["lm"]:
-+                xml += "    <feature policy='optional' name='lm'/>\n"
-+
-             xml += "  </cpu>"
- 
-         return xml
diff --git a/virtinst-0.500.3-use-x2apic.patch b/virtinst-0.500.3-use-x2apic.patch
deleted file mode 100644
index 3868c2b..0000000
--- a/virtinst-0.500.3-use-x2apic.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -rup virtinst-0.500.3/virtinst/Guest.py new/virtinst/Guest.py
---- virtinst-0.500.3/virtinst/Guest.py	2010-03-23 16:57:08.000000000 -0400
-+++ new/virtinst/Guest.py	2010-05-27 16:13:40.115795000 -0400
-@@ -720,8 +720,17 @@ class Guest(object):
-         """
-         Return <cpu> XML
-         """
--        # Just a stub for now
--        return ""
-+        xml = ""
-+        is_kvm = self.type == "kvm"
-+        model = self._caps.host.cpu.model
-+
-+        if is_kvm and model:
-+            xml += "  <cpu match='exact'>\n"
-+            xml += "    <model>%s</model>\n" % model
-+            xml += "    <feature policy='force' name='x2apic'/>\n"
-+            xml += "  </cpu>"
-+
-+        return xml
- 
-     def _get_clock_xml(self):
-         """