diff --git a/virt-manager-fix-broken-cspo.patch b/virt-manager-fix-broken-cspo.patch
new file mode 100644
index 0000000..b28ad0b
--- /dev/null
+++ b/virt-manager-fix-broken-cspo.patch
@@ -0,0 +1,18 @@
+commit cb56316cf3702f03b05e30f406ff3028e45f7bfb
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Tue Apr 5 16:21:42 2011 -0400
+
+    cs.po: Busted Plural-forms crashes python gettext
+
+diff --git a/po/cs.po b/po/cs.po
+index d1808a7..cc13a1b 100644
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -16,7 +16,6 @@ msgstr ""
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Plural-Forms: \n"
+ 
+ #: ../src/virt-manager.desktop.in.in.h:1
+ msgid "Manage virtual machines"
diff --git a/virt-manager-fix-hotplug-fallback.patch b/virt-manager-fix-hotplug-fallback.patch
new file mode 100644
index 0000000..8ae3f57
--- /dev/null
+++ b/virt-manager-fix-hotplug-fallback.patch
@@ -0,0 +1,20 @@
+commit 4922222c2c7b13704b6f461aedbee9ec06c01b5b
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Tue Apr 5 16:15:05 2011 -0400
+
+    addhw: Fix nonhotplug to running guest
+
+diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py
+index 885c8b9..7fa5b6e 100644
+--- a/src/virtManager/addhardware.py
++++ b/src/virtManager/addhardware.py
+@@ -938,7 +938,8 @@ class vmmAddHardware(vmmGObjectUI):
+                   "Would you like to make the device available after the "
+                   "next VM shutdown?")),
+                 dialog_type=gtk.MESSAGE_WARNING,
+-                buttons=gtk.BUTTONS_YES_NO)
++                buttons=gtk.BUTTONS_YES_NO,
++                async=False)
+ 
+             if not res:
+                 return (False, None)
diff --git a/virt-manager.spec b/virt-manager.spec
index 822b5d9..6d5fed7 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -2,7 +2,7 @@
 
 %define _package virt-manager
 %define _version 0.8.7
-%define _release 1
+%define _release 2
 %define virtinst_version 0.500.6
 
 %define qemu_user                  "qemu"
@@ -33,6 +33,10 @@ URL: http://virt-manager.org/
 Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
 # Fix a couple configure options
 Patch1: %{name}-fix-config-options.patch
+# Fix broken cs.po which crashed gettext
+Patch2: %{name}-fix-broken-cspo.patch
+# Fix offline attach fallback if hotplug fails
+Patch3: %{name}-fix-hotplug-fallback.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -98,6 +102,8 @@ management API.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %if %{qemu_user}
@@ -206,6 +212,10 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Thu Apr 07 2011 Cole Robinson <crobinso@redhat.com> - 0.8.7-2.fc14
+- Fix broken cs.po which crashed gettext
+- Fix offline attach fallback if hotplug fails
+
 * Thu Mar 31 2011 Cole Robinson <crobinso@redhat.com> - 0.8.7-1.fc14
 - Rebased to version 0.8.7
 - Allow renaming an offline VM