diff --git a/python-virtinst.spec b/python-virtinst.spec
index d19e7b0..8f65660 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: 1%{_extra_release}
+Release: 2%{_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
@@ -27,6 +27,10 @@ Patch2: %{appname}-%{version}-seclabel-comma.patch
 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
+# Fix pool source listing in virt-manager
+Patch6: %{appname}-%{version}-poolsource-check.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -58,6 +62,8 @@ and install new VMs) and virt-clone (clone an existing virtual machine).
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 python setup.py build
@@ -93,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* 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
+
 * Wed May 27 2010 Cole Robinson <crobinso@redhat.com> - 0.500.3-1.fc13
 - Rebase to 0.500.3
 - virt-install: New --watchdog option: configure a virtual watchdog device
diff --git a/virtinst-0.500.3-fix-windows-cdrom.patch b/virtinst-0.500.3-fix-windows-cdrom.patch
new file mode 100644
index 0000000..8ae9f4d
--- /dev/null
+++ b/virtinst-0.500.3-fix-windows-cdrom.patch
@@ -0,0 +1,34 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1277307256 14400
+# Node ID e5ab15cd4c243f9ac2e7bcad77970dbe1c74cb81
+# Parent  1ade3d1eaa72f8b6a097ac79e1fe7b5e66cedbf0
+virt-install: Fix CDROM attach for windows installs
+
+We were unintentionally dropping the CDROM device for the 2nd stage of the
+install.
+
+diff -r 1ade3d1eaa72 -r e5ab15cd4c24 virtinst/Guest.py
+--- a/virtinst/Guest.py	Mon Jun 21 11:46:13 2010 -0400
++++ b/virtinst/Guest.py	Wed Jun 23 11:34:16 2010 -0400
+@@ -822,6 +822,10 @@
+     ############################
+ 
+     def _prepare_install(self, meter):
++        # Empty install dev list
++        # Warning: moving this to cleanup_install breaks continue_install
++        self._install_devices = []
++
+         # Initialize install device list
+         self._install_devices = self.get_all_devices()[:]
+ 
+@@ -838,9 +842,6 @@
+         self._set_defaults(self._get_install_devs)
+ 
+     def _cleanup_install(self):
+-        # Empty install dev list
+-        self._install_devices = []
+-
+         self._installer.cleanup()
+ 
+     def _create_devices(self, progresscb):
diff --git a/virtinst-0.500.3-poolsource-check.patch b/virtinst-0.500.3-poolsource-check.patch
new file mode 100644
index 0000000..8f9fa75
--- /dev/null
+++ b/virtinst-0.500.3-poolsource-check.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1276536501 14400
+# Node ID 7870801299a53c6fc8e2d24c30069b66e7dc108e
+# Parent  6e5b269b5611f20d7b42d910f17162a97e36aaaf
+support: Fix check for findStoragePoolSources
+
+diff -r 6e5b269b5611 -r 7870801299a5 virtinst/support.py
+--- a/virtinst/support.py	Wed Jun 09 11:53:57 2010 -0400
++++ b/virtinst/support.py	Mon Jun 14 13:28:21 2010 -0400
+@@ -97,7 +97,7 @@
+     },
+ 
+     SUPPORT_CONN_FINDPOOLSOURCES : {
+-        "function" : "virConnect.findPoolSources",
++        "function" : "virConnect.findStoragePoolSources",
+     },
+ 
+     SUPPORT_CONN_KEYMAP_AUTODETECT : {