diff --git a/python-virtinst.spec b/python-virtinst.spec
index 8f65660..5fe3a8d 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: 2%{_extra_release}
+Release: 3%{_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
@@ -31,6 +31,8 @@ Patch4: %{appname}-%{version}-use-x2apic.patch
 Patch5: %{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
 
 License: GPLv2+
 Group: Development/Libraries
@@ -64,6 +66,7 @@ and install new VMs) and virt-clone (clone an existing virtual machine).
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 python setup.py build
@@ -99,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* 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)
+
 * Wed Jul 07 2010 Cole Robinson <crobinso@redhat.com> - 0.500.3-2.fc13
 - Keep windows CDROM attached for second install stage
 - Fix pool source listing in virt-manager
diff --git a/virtinst-0.500.3-64bit-flag.patch b/virtinst-0.500.3-64bit-flag.patch
new file mode 100644
index 0000000..2a4c543
--- /dev/null
+++ b/virtinst-0.500.3-64bit-flag.patch
@@ -0,0 +1,16 @@
+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