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 239a684..357be8a 100755
--- a/common/qubes_core
+++ b/common/qubes_core
@@ -15,8 +15,8 @@ start()
 		exit 1
 	fi
 
-    # 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
@@ -26,17 +26,6 @@ start()
 		hostname $name
 	fi
 
-	ip=$(/usr/bin/xenstore-read qubes_ip)
-	netmask=$(/usr/bin/xenstore-read qubes_netmask)
-	gateway=$(/usr/bin/xenstore-read qubes_gateway)
-	secondary_dns=$(/usr/bin/xenstore-read qubes_secondary_dns)
-	if [ x$ip != x ]; then
-		/sbin/ifconfig eth0 $ip netmask 255.255.255.255 up
-		/sbin/route add default dev eth0
-		echo "nameserver $gateway" > /etc/resolv.conf
-		echo "nameserver $secondary_dns" >> /etc/resolv.conf
-	fi
-
 	if [ -e /dev/xvdb ] ; then
 		mount /rw
 
@@ -71,6 +60,11 @@ start()
 
 	success
 	echo ""
+
+	type=$(/usr/bin/xenstore-read qubes_vm_type)
+	if [ "$type" == "ProxyVM" ]; then
+		/sbin/service ntpd start
+	fi
 	return 0
 }
 
diff --git a/common/qubes_core.modules b/common/qubes_core.modules
new file mode 100755
index 0000000..f5cb69c
--- /dev/null
+++ b/common/qubes_core.modules
@@ -0,0 +1 @@
+modprobe xen-evtchn || modprobe evtchn
diff --git a/common/qubes_download_dom0_updates.sh b/common/qubes_download_dom0_updates.sh
index 488eecb..cb771a3 100755
--- a/common/qubes_download_dom0_updates.sh
+++ b/common/qubes_download_dom0_updates.sh
@@ -21,7 +21,26 @@ fi
 mkdir -p $DOM0_UPDATES_DIR/etc
 cp /etc/yum.conf $DOM0_UPDATES_DIR/etc/
 
-echo "Checking for updates..."
+# check also for template updates
+echo "Checking for template updates..."
+TEMPLATEPKGLIST=`yum check-update -q | cut -f 1 -d ' '`
+if [ -n "$TEMPLATEPKGLIST" ] && [ "$GUI" = 1 ]; then
+    TEMPLATE_UPDATE_COUNT=`echo "$TEMPLATEPKGLIST" | wc -w`
+    NOTIFY_UPDATE_COUNT=`cat /var/run/qubes/template_update_last_notify_count 2> /dev/null`
+    if [ "$NOTIFY_UPDATE_COUNT" != "$TEMPLATE_UPDATE_COUNT" ]; then
+        echo -n $TEMPLATE_UPDATE_COUNT > /var/run/qubes/template_update_last_notify_count
+        NOTIFY_PID=`cat /var/run/qubes/template_update_notify.pid 2> /dev/null`
+        if [ -z "$NOTIFY_PID" ] || ! kill -0 $NOTIFY_PID; then
+            NOTIFY_TITLE="Template update"
+            NOTIFY_TEXT="There are $TEMPLATE_UPDATE_COUNT updates available for TemplateVM"
+            NOTIFY_INFO="$NOTIFY_TEXT. Start TemplateVM to update it."
+            ( zenity --notification --text "$NOTIFY_TEXT"; zenity --warning --title "$NOTIFY_TITLE" --text "$NOTIFY_INFO") &
+            echo $! > /var/run/qubes/template_update_notify.pid
+        fi
+    fi
+fi
+
+echo "Checking for dom0 updates..."
 PKGLIST=`yum --installroot $DOM0_UPDATES_DIR check-update -q | cut -f 1 -d ' '`
 
 if [ -z $PKGLIST ]; then
diff --git a/rpm_spec/core-commonvm.spec b/rpm_spec/core-commonvm.spec
index d754c36..624c470 100644
--- a/rpm_spec/core-commonvm.spec
+++ b/rpm_spec/core-commonvm.spec
@@ -86,6 +86,11 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/qubes
 cp qubes_trigger_sync_appmenus.sh $RPM_BUILD_ROOT/usr/lib/qubes/
 mkdir -p $RPM_BUILD_ROOT/var/lib/qubes/dom0-updates
 
+install -D qubes_core.modules $RPM_BUILD_ROOT/etc/sysconfig/modules/qubes_core.modules
+
+mkdir -p $RPM_BUILD_ROOT/lib/firmware
+ln -s /lib/modules/firmware $RPM_BUILD_ROOT/lib/firmware/updates
+
 %triggerin -- initscripts
 cp /var/lib/qubes/serial.conf /etc/init/serial.conf
 
@@ -232,7 +237,9 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/qubes_serial_login
 /usr/bin/xenstore-watch-qubes
 /etc/udev/rules.d/qubes_network.rules
+/etc/sysconfig/modules/qubes_core.modules
 /usr/lib/qubes/setup_ip
 /etc/yum/post-actions/qubes_trigger_sync_appmenus.action
 /usr/lib/qubes/qubes_trigger_sync_appmenus.sh
 /usr/lib/qubes/qubes_download_dom0_updates.sh
+/lib/firmware/updates
diff --git a/version_vm b/version_vm
index fdd3be6..ec70f75 100644
--- a/version_vm
+++ b/version_vm
@@ -1 +1 @@
-1.6.2
+1.6.6