diff --git a/Makefile b/Makefile
index 1d1f4d9..b9733a1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,15 @@
 RPMS_DIR=rpm/
+VERSION := $(shell cat version)
 help:
-	@echo "make rpms -- generate binary rpm packages"
-	@echo "make res  -- compile resources"
-	@echo "make update-repo -- copy newly generated rpms to qubes yum repo"
-	@echo "make update-repo-testing -- same, but to -testing repo"
+	@echo "make rpms                 -- generate binary rpm packages"
+	@echo "make res                  -- compile resources"
+	@echo "make update-repo-current  -- copy newly generated rpms to qubes yum repo"
+	@echo "make update-repo-unstable -- same, but to -testing repo"
 
 
 rpms:	
 	rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/qmgr.spec
-	rpm --addsign $(RPMS_DIR)/x86_64/*.rpm
+	rpm --addsign $(RPMS_DIR)/x86_64/qubes-manager*$(VERSION)*.rpm
 
 res:
 	pyrcc4 -o qubesmanager/qrc_resources.py resources.qrc
@@ -16,9 +17,8 @@ res:
 	pyuic4 -o qubesmanager/ui_editfwrulesdlg.py editfwrulesdlg.ui
 	pyuic4 -o qubesmanager/ui_newfwruledlg.py newfwruledlg.ui
 
-update-repo:
-	ln -f $(RPMS_DIR)/x86_64/qubes-manager-*.rpm ../yum/r1/dom0/rpm/
-
-update-repo-testing:
-	ln -f $(RPMS_DIR)/x86_64/qubes-manager-*.rpm ../yum/r1-testing/dom0/rpm/
+update-repo-current:
+	ln -f $(RPMS_DIR)/x86_64/qubes-manager-*$(VERSION)*.rpm ../yum/current-release/current/dom0/rpm/
 
+update-repo-unstable:
+	ln -f $(RPMS_DIR)/x86_64/qubes-manager-*$(VERSION)*.rpm ../yum/current-release/unstable/dom0/rpm/