diff --git a/Makefile.common b/Makefile.common
index e5d6cd7..31ffa75 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -91,36 +91,31 @@ update-repo-current:
 	ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/
 	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/
 	ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/
-	ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f13/rpm/
-	ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f14/rpm/
-	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f13/rpm/
-	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f14/rpm/
-	ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f13/rpm/
-	ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f14/rpm/
+	for vmrepo in ../yum/current-release/current/vm/* ; do \
+		ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\
+		ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\
+		ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\
+	done
 
 update-repo-current-testing:
 	ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/
 	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/
 	ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/
-	ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f13/rpm/
-	ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f14/rpm/
-	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f13/rpm/
-	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f14/rpm/
-	ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f13/rpm/
-	ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f14/rpm/
-
+	for vmrepo in ../yum/current-release/current-testing/vm/* ; do \
+		ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\
+		ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\
+		ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\
+	done
 
 update-repo-unstable:
 	ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/
 	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/
 	ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/
-	ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f13/rpm/
-	ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f14/rpm/
-	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f13/rpm/
-	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f14/rpm/
-	ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f13/rpm/
-	ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f14/rpm/
-
+	for vmrepo in ../yum/current-release/unstable/vm/* ; do \
+		ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\
+		ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\
+		ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\
+	done
 
 # mop up, printing out exactly what was mopped.