diff --git a/Makefile b/Makefile
index 3ebb6558..dca1b37b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-VERSION=1.1.0
+VERSION=$(shell grep '<version>' appinfo/info.xml | sed -e 's/^.*<version>\(.*\)<\/version>.*$$/\1/')
 
 .PHONY: dist
-dist: owncloud-collabora-online.spec info.xml
+dist: owncloud-collabora-online.spec appinfo/info.xml
 	rm -rf owncloud-collabora-online-$(VERSION)
 	mkdir owncloud-collabora-online-$(VERSION)
-	tar cf - --exclude appinfo/info.xml.in *.php \
+	tar cf - *.php \
                 appinfo \
                 assets \
                 controller \
@@ -18,10 +18,10 @@ dist: owncloud-collabora-online.spec info.xml
 	tar cfz owncloud-collabora-online-$(VERSION).tar.gz owncloud-collabora-online-$(VERSION)
 	rm -rf owncloud-collabora-online-$(VERSION)
 
-app: info.xml
+app: appinfo/info.xml
 	rm -rf richdocuments
 	mkdir richdocuments
-	tar cf - --exclude appinfo/info.xml.in *.php \
+	tar cf - *.php \
                 appinfo \
                 assets \
                 controller \
@@ -35,8 +35,5 @@ app: info.xml
 	zip -r richdocuments.zip richdocuments
 	rm -rf richdocuments
 
-owncloud-collabora-online.spec: owncloud-collabora-online.spec.in Makefile
+owncloud-collabora-online.spec: owncloud-collabora-online.spec.in appinfo/info.xml
 	sed -e 's/@PACKAGE_VERSION@/$(VERSION)/g' <owncloud-collabora-online.spec.in >owncloud-collabora-online.spec
-
-info.xml: appinfo/info.xml.in Makefile
-	sed -e 's/@PACKAGE_VERSION@/$(VERSION)/g' <appinfo/info.xml.in >appinfo/info.xml