diff --git a/Makefile b/Makefile
index 4717ce0..0ae46dd 100644
--- a/Makefile
+++ b/Makefile
@@ -12,15 +12,20 @@ help:
 	@echo "make update-repo-installer -- copy dom0 rpms to installer repo"
 	@echo "make clean                 -- cleanup"
 
-rpms:	
+rpms: rpms-vm rpms-dom0
+
+rpms-vm:
 	rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-vm.spec
 	rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-vm-kernel-placeholder.spec
-	rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-dom0.spec
 	rpm --addsign \
-		$(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*.rpm \
 		$(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION_VM)*.rpm \
 		$(RPMS_DIR)/x86_64/qubes-core-vm-kernel-placeholder-*.rpm
 
+rpms-dom0:
+	rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-dom0.spec
+	rpm --addsign \
+		$(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*.rpm
+
 rpms-vaio-fixes:
 	rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-dom0-vaio-fixes.spec
 	rpm --addsign $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*.rpm 
diff --git a/build-deps.list b/build-deps.list
new file mode 100644
index 0000000..55e7836
--- /dev/null
+++ b/build-deps.list
@@ -0,0 +1 @@
+xen-devel-*DIST*
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 763e6b1..64884ea 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -212,7 +212,7 @@ remove_ShowIn () {
 for F in abrt-applet deja-dup-monitor imsettings-start krb5-auth-dialog pulseaudio restorecond sealertauto gnome-power-manager gnome-sound-applet gnome-screensaver orca-autostart; do
 	if [ -e /etc/xdg/autostart/$F.desktop ]; then
 		remove_ShowIn $F
-		echo 'NotShowIn=QUBES' >> /etc/xdg/autostart/$F.desktop
+		echo 'NotShowIn=QUBES;' >> /etc/xdg/autostart/$F.desktop
 	fi
 done
 
@@ -220,7 +220,7 @@ done
 for F in gcm-apply ; do
 	if [ -e /etc/xdg/autostart/$F.desktop ]; then
 		remove_ShowIn $F
-		echo 'NotShowIn=DisposableVM' >> /etc/xdg/autostart/$F.desktop
+		echo 'NotShowIn=DisposableVM;' >> /etc/xdg/autostart/$F.desktop
 	fi
 done
 
diff --git a/version_vm b/version_vm
index c8a481c..3e3c2f1 100644
--- a/version_vm
+++ b/version_vm
@@ -1 +1 @@
-1.7.46
+2.1.1
diff --git a/vm-init.d/qubes_core b/vm-init.d/qubes_core
index c5fe5d2..4830587 100755
--- a/vm-init.d/qubes_core
+++ b/vm-init.d/qubes_core
@@ -17,6 +17,8 @@ start()
 
 	# Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
 	chmod 666 /proc/xen/xenbus
+	# Set permissions to files needed to listen at vchan
+	chmod 666 /proc/u2mfn /dev/xen/evtchn
 
 	mkdir -p /var/run/xen-hotplug
 
diff --git a/vm-systemd/qubes-sysinit.sh b/vm-systemd/qubes-sysinit.sh
index b054407..f0b098a 100755
--- a/vm-systemd/qubes-sysinit.sh
+++ b/vm-systemd/qubes-sysinit.sh
@@ -25,6 +25,8 @@ mkdir -p /var/run/xen-hotplug
 
 # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
 chmod 666 /proc/xen/xenbus
+# Set permissions to files needed to listen at vchan
+chmod 666 /proc/u2mfn /dev/xen/evtchn
 
 # Set default services depending on VM type
 TYPE=`$XS_READ qubes_vm_type 2> /dev/null`