diff --git a/appinfo/info.xml b/appinfo/info.xml
index 853d390..dc73655 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -3,10 +3,13 @@
     <id>gpxedit</id>
     <name>GpxEdit</name>
     <description>
-# GpxEdit owncloud/nextcloud application
+# GpxEdit Nextcloud application
+# GpxEdit Owncloud application
 
-Simple Owncloud/Nextcloud app to load, edit and save GPX files on an interactive map.
-You can load/save files from your Owncloud/Nextcloud file storage.
+Simple Nextcloud app to load, edit and save GPX files on an interactive map.
+Simple Owncloud app to load, edit and save GPX files on an interactive map.
+You can load/save files from your Nextcloud file storage.
+You can load/save files from your Owncloud file storage.
 GPX, KML, CSV (unicsv format) and geotagged JPG are supported for loading. JPG files are loaded as waypoints.
 There is a file explorer inside the app interface to select a file to load and a folder to save what is currently on the map.
 
diff --git a/makefile b/makefile
index 7671bdf..82b7217 100644
--- a/makefile
+++ b/makefile
@@ -3,24 +3,33 @@ app_version=$(version)
 project_dir=$(CURDIR)/../$(app_name)
 build_dir=/tmp/build
 sign_dir=/tmp/sign
+build_dir_own=/tmp/build_own
+sign_dir_own=/tmp/sign_own
 cert_dir=$(HOME)/.nextcloud/certificates
+cert_dir_own=$(HOME)/.owncloud/certificates
 webserveruser ?= www-data
 occ_dir ?= /var/www/html/nextcloud
+occ_dir_own ?= /var/www/html/owncloud
 
 all: appstore
 
 clean:
 	rm -rf $(build_dir)
+	rm -rf $(build_dir_own)
 	rm -rf $(sign_dir)
+	rm -rf $(sign_dir_own)
 
 appstore: clean
 	mkdir -p $(sign_dir)
+	mkdir -p $(sign_dir)_own
 	mkdir -p $(build_dir)
+	mkdir -p $(build_dir)_own
 	rsync -a \
 	--exclude=.git \
 	--exclude=appinfo/signature.json \
 	--exclude=*.swp \
 	--exclude=build \
+	--exclude=README.md \
 	--exclude=.gitignore \
 	--exclude=.travis.yml \
 	--exclude=.scrutinizer.yml \
@@ -36,10 +45,20 @@ appstore: clean
 	--exclude=tests \
 	--exclude=vendor/bin \
 	$(project_dir) $(sign_dir)
+	cp -r $(sign_dir)/$(app_name) $(sign_dir_own)/
+	# adapt info.xml
+	sed -i '/[^<][oO]wncloud[^>]/d' $(sign_dir)/$(app_name)/appinfo/info.xml
+	sed -i '/[nN]extcloud/d' $(sign_dir_own)/$(app_name)/appinfo/info.xml
 	# give the webserver user the right to create signature file
-	sudo chown $(webserveruser) $(sign_dir)/$(app_name)/appinfo
+	sudo chown $(webserveruser) $(sign_dir)/$(app_name)/appinfo $(sign_dir_own)/$(app_name)/appinfo
 	sudo -u $(webserveruser) php $(occ_dir)/occ integrity:sign-app --privateKey=$(cert_dir)/$(app_name).key --certificate=$(cert_dir)/$(app_name).crt --path=$(sign_dir)/$(app_name)/
-	sudo chown -R $(USER) $(sign_dir)/$(app_name)/appinfo
+	sudo -u $(webserveruser) php $(occ_dir_own)/occ integrity:sign-app --privateKey=$(cert_dir_own)/$(app_name).key --certificate=$(cert_dir_own)/$(app_name).crt --path=$(sign_dir_own)/$(app_name)/
+	sudo chown -R $(USER) $(sign_dir)/$(app_name)/appinfo $(sign_dir_own)/$(app_name)/appinfo
 	tar -czf $(build_dir)/$(app_name)-$(app_version).tar.gz \
 		-C $(sign_dir) $(app_name)
+	tar -czf $(build_dir_own)/$(app_name)-$(app_version).tar.gz \
+		-C $(sign_dir_own) $(app_name)
+	echo NEXTCLOUD------------------------------------------
 	openssl dgst -sha512 -sign $(cert_dir)/$(app_name).key $(build_dir)/$(app_name)-$(app_version).tar.gz | openssl base64
+	echo OWNCLOUD-------------------------------------------
+	openssl dgst -sha512 -sign $(cert_dir_own)/$(app_name).key $(build_dir_own)/$(app_name)-$(app_version).tar.gz | openssl base64