Index: trunk/scripts/git-migration/svn.yml
===================================================================
--- trunk/scripts/git-migration/svn.yml	(revision 2985)
+++ trunk/scripts/git-migration/svn.yml	(revision 2986)
@@ -2,5 +2,8 @@
 ---
 packages:
-  hvirt-devconfig: {}
+  hvirt-config: {}
+  hvirt-devconfig:
+    {punt: 2885, merge: hvirt-config}
+  hvirt-meta: {}
   invirt-autoinstaller: {}
   invirt-base: {}
@@ -32,4 +35,6 @@
   invirt-vnc-server: {}
   invirt-web: {}
+  invirt-web-afs-apache:
+    {punt: 2920}
   invirt-web-iptables:
     {merge: invirt-web}
@@ -44,5 +49,5 @@
     {undouble: [314, 315], punt: 1350, merge: invirt-base}
   sipb-xen-chrony-config:
-    {punt: 1351}
+    {punt: 1282}
   sipb-xen-clvm-config:
     {punt: 1569}