diff --git a/core-modules/000QubesVm.py b/core-modules/000QubesVm.py
index 8cbd3b2f..c0c52671 100644
--- a/core-modules/000QubesVm.py
+++ b/core-modules/000QubesVm.py
@@ -196,7 +196,7 @@ class QubesVm(object):
             'backup_content', 'backup_size', 'backup_path' ]:
             attrs[prop]['save'] = lambda prop=prop: str(getattr(self, prop))
         # Simple paths
-        for prop in ['conf_file']:
+        for prop in ['conf_file', 'firewall_conf']:
             attrs[prop]['save'] = \
                 lambda prop=prop: self.relative_path(getattr(self, prop))
             attrs[prop]['save_skip'] = \
@@ -1246,6 +1246,9 @@ class QubesVm(object):
                         print >> sys.stderr, "--> Copying icon: {0} -> {1}".format(src_vm.icon_path, self.icon_path)
                     shutil.copy(src_vm.icon_path, self.icon_path)
 
+        if src_vm.has_firewall():
+            self.write_firewall_conf(src_vm.get_firewall_conf())
+
         # Make sure that we have UUID allocated
         self._update_libvirt_domain()