diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index 3b16486c..a6550996 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -1203,6 +1203,13 @@ class QubesVm(object):
                     os.path.basename(sys.argv[0]), err)
             return False
 
+        # Automatically enable/disable 'yum-proxy-setup' service based on allowYumProxy
+        if conf['allowYumProxy']:
+            self.services['yum-proxy-setup'] = True
+        else:
+            if self.services.has_key('yum-proxy-setup'):
+                self.services.pop('yum-proxy-setup')
+
         return True
 
     def has_firewall(self):
diff --git a/dom0/qvm-tools/qvm-firewall b/dom0/qvm-tools/qvm-firewall
index b5af141e..581fd3ca 100755
--- a/dom0/qvm-tools/qvm-firewall
+++ b/dom0/qvm-tools/qvm-firewall
@@ -314,6 +314,7 @@ def main():
         if vm.is_running():
             if vm.netvm is not None and vm.netvm.is_proxyvm():
                 vm.netvm.write_iptables_xenstore_entry()
+        qvm_collection.save()
 
     if not options.do_list:
         qvm_collection.unlock_db()