diff --git a/virt-manager.changes b/virt-manager.changes
index ed9921e7..4b6e64a8 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jul 28 16:06:55 MDT 2010 - carnold@novell.com
+
+- bnc#624250 - L3: virt-manager doesn't update "Autostart" setting
+  in vm configuration correctly
+  virtman-autorestart.diff
+
 -------------------------------------------------------------------
 Fri Jun 25 09:22:04 MDT 2010 - jfehlig@novell.com
 
diff --git a/virt-manager.spec b/virt-manager.spec
index 0d4be744..ca3a79a4 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -48,6 +48,7 @@ Patch57:        virtman-help.diff
 Patch58:        virtman-keycombo.diff
 Patch59:        virtman-autoconnect.diff
 Patch60:        virtman-device-flags.diff
+Patch61:        virtman-autorestart.diff
 Patch81:        virtinst-cdrom.diff
 Patch82:        virtinst-storage-ocfs2.diff
 ExclusiveArch:  %{ix86} x86_64
@@ -138,6 +139,7 @@ Authors:
 %patch58 -p1
 %patch59 -p1
 %patch60 -p1
+%patch61 -p1
 pushd $RPM_BUILD_DIR/%{virtinst_name}
 %patch81 -p1
 %patch82 -p1
diff --git a/virtman-autorestart.diff b/virtman-autorestart.diff
new file mode 100644
index 00000000..c95f5861
--- /dev/null
+++ b/virtman-autorestart.diff
@@ -0,0 +1,43 @@
+Index: virt-manager-0.8.4/src/virtManager/details.py
+===================================================================
+--- virt-manager-0.8.4.orig/src/virtManager/details.py
++++ virt-manager-0.8.4/src/virtManager/details.py
+@@ -1335,8 +1335,15 @@ class vmmDetails(gobject.GObject):
+                                           self.vm.hotplug_both_mem,
+                                           (curmem, maxmem))
+ 
+-    # Boot device / Autostart
++    # Boot device
+     def config_boot_options_apply(self):
++        bootdevs = self.get_config_boot_devs()
++        return self._change_config_helper(self.vm.set_boot_device,
++                                          (bootdevs,))
++
++    # Autostart - See bnc#624250 - L3: virt-manager doesn't update
++    #             "Autostart" setting in vm configuration correctly
++    def update_on_xend_start(self):
+         auto = self.window.get_widget("config-autostart")
+ 
+         if auto.get_property("sensitive"):
+@@ -1345,11 +1352,6 @@ class vmmDetails(gobject.GObject):
+             except Exception, e:
+                 self.err.show_err((_("Error changing autostart value: %s") %
+                                    str(e)), "".join(traceback.format_exc()))
+-                return False
+-
+-        bootdevs = self.get_config_boot_devs()
+-        return self._change_config_helper(self.vm.set_boot_device,
+-                                          (bootdevs,))
+ 
+     # CDROM
+     def change_storage_media(self, dev_id_info, newpath, _type=None):
+@@ -1505,6 +1507,9 @@ class vmmDetails(gobject.GObject):
+             else:
+                 self.err.show_info(_("These changes will take effect after "
+                                      "the next guest reboot."))
++
++        self.update_on_xend_start()
++
+         return True
+ 
+     ########################