diff --git a/Makefile b/Makefile
index 881b6a4..8f98ae4 100644
--- a/Makefile
+++ b/Makefile
@@ -29,24 +29,26 @@ rpms-vaio-fixes:
 update-repo-current:
 	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/current/dom0/rpm/
 	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*fc13*.rpm ../yum/current-release/current/dom0/rpm/
-	ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc13*.rpm ../yum/current-release/current/vm/f13/rpm/
-	ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/current/vm/f14/rpm/
-	cd ../yum && ./update_repo.sh
+	for vmrepo in ../yum/current-release/current/vm/* ; do \
+		dist=$$(basename $$vmrepo) ;\
+		ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\
+	done
 
 update-repo-current-testing:
 	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/current-testing/dom0/rpm/
 	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*fc13*.rpm ../yum/current-release/current-testing/dom0/rpm/
-	ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc13*.rpm ../yum/current-release/current-testing/vm/f13/rpm/
-	ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/current-testing/vm/f14/rpm/
-	cd ../yum && ./update_repo.sh
-
+	for vmrepo in ../yum/current-release/current-testing/vm/* ; do \
+		dist=$$(basename $$vmrepo) ;\
+		ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\
+	done
 
 update-repo-unstable:
 	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/unstable/dom0/rpm/
 	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*fc13*.rpm ../yum/current-release/unstable/dom0/rpm/
-	ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc13*.rpm ../yum/current-release/unstable/vm/f13/rpm/
-	ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/unstable/vm/f14/rpm/
-	cd ../yum && ./update_repo.sh
+	for vmrepo in ../yum/current-release/unstable/vm/* ; do \
+		dist=$$(basename $$vmrepo) ;\
+		ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\
+	done
 
 update-repo-installer:
 	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-*$(VERSION_DOM0)*fc13*.rpm ../installer/yum/qubes-dom0/rpm/
diff --git a/common/qubes.fc13.repo b/common/qubes.fc13.repo
index 982b095..376b490 100644
--- a/common/qubes.fc13.repo
+++ b/common/qubes.fc13.repo
@@ -1,19 +1,19 @@
 [qubes-vm-current]
 name = Qubes OS Repository for VM (updates)
-baseurl = http://yum.qubes-os.org/r1-beta1/current/vm/f13
+baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc13
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
 gpgcheck = 1
 
 [qubes-vm-current-testing]
 name = Qubes OS Repository for VM (updates-testing)
-baseurl = http://yum.qubes-os.org/r1-beta1/current-testing/vm/f13
+baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc13
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
 gpgcheck = 1
 enabled=0
 
 [qubes-vm-unstable]
 name = Qubes OS Repository for VM (unstable)
-baseurl = http://yum.qubes-os.org/r1-beta1/unstable/vm/f13
+baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc13
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
 gpgcheck = 1
 enabled=0
diff --git a/common/qubes.fc14.repo b/common/qubes.fc14.repo
index b10c80c..2020d1e 100644
--- a/common/qubes.fc14.repo
+++ b/common/qubes.fc14.repo
@@ -1,19 +1,19 @@
 [qubes-vm-current]
 name = Qubes OS Repository for VM (updates)
-baseurl = http://yum.qubes-os.org/r1-beta1/current/vm/f14
+baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc14
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
 gpgcheck = 1
 
 [qubes-vm-current-testing]
 name = Qubes OS Repository for VM (updates-testing)
-baseurl = http://yum.qubes-os.org/r1-beta1/current-testing/vm/f14
+baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc14
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
 gpgcheck = 1
 enabled=0
 
 [qubes-vm-unstable]
 name = Qubes OS Repository for VM (unstable)
-baseurl = http://yum.qubes-os.org/r1-beta1/unstable/vm/f14
+baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc14
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
 gpgcheck = 1
 enabled=0
diff --git a/common/qubes_core b/common/qubes_core
index b941efb..fb2d30c 100755
--- a/common/qubes_core
+++ b/common/qubes_core
@@ -15,10 +15,11 @@ start()
 		exit 1
 	fi
 
-    modprobe u2mfn
+	modprobe evtchn
+	modprobe u2mfn
 
-    # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
-    chmod 666 /proc/xen/xenbus
+	# Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
+	chmod 666 /proc/xen/xenbus
 
 	name=$(/usr/bin/xenstore-read name)
 	if ! [ -f /etc/this_is_dvm ] ; then
diff --git a/version_vm b/version_vm
index 9edc58b..ec70f75 100644
--- a/version_vm
+++ b/version_vm
@@ -1 +1 @@
-1.6.4
+1.6.6