diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 6e21b344..46c89c75 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.20
+current_version = 0.6.21
 tag = True
 
 [bumpversion:file:Makefile]
diff --git a/Makefile b/Makefile
index ba430e4d..10aa77af 100644
--- a/Makefile
+++ b/Makefile
@@ -19,15 +19,15 @@ Vorta.dmg-Vagrant:
 	vagrant halt darwin64
 	cp -R bin/darwin/Sparkle.framework dist/Vorta.app/Contents/Frameworks/
 	cd dist; codesign --deep --sign 'Developer ID Application: Manuel Riel (CNMSCAXT48)' Vorta.app
-	sleep 2; appdmg appdmg.json dist/vorta-0.6.20.dmg
+	sleep 2; appdmg appdmg.json dist/vorta-0.6.21.dmg
 
 Vorta.dmg: Vorta.app
-	# sleep 2; cd dist; zip -9rq vorta-0.6.20.zip Vorta.app
-	rm -rf dist/vorta-0.6.20.dmg
-	sleep 2; appdmg appdmg.json dist/vorta-0.6.20.dmg
+	# sleep 2; cd dist; zip -9rq vorta-0.6.21.zip Vorta.app
+	rm -rf dist/vorta-0.6.21.dmg
+	sleep 2; appdmg appdmg.json dist/vorta-0.6.21.dmg
 
 github-release: Vorta.dmg
-	hub release create --attach=dist/vorta-0.6.20.dmg v0.6.20
+	hub release create --attach=dist/vorta-0.6.21.dmg v0.6.21
 	git checkout gh-pages
 	git commit -m 'rebuild pages' --allow-empty
 	git push upstream gh-pages
@@ -35,12 +35,13 @@ github-release: Vorta.dmg
 
 pypi-release: translations-to-qm
 	python setup.py sdist
-	twine upload dist/vorta-0.6.20.tar.gz
+	twine upload dist/vorta-0.6.21.tar.gz
 
 bump-version:  ## Add new version tag and push to upstream repo.
 	bumpversion patch
-	xmlstarlet ed -L -u 'component/releases/release/@date' -v $$(date +%F) src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml
 	#bumpversion minor
+	xmlstarlet ed -L -u 'component/releases/release/@date' -v $$(date +%F) src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml
+	git commit -a -m 'Bump version'
 	git push upstream
 
 travis-debug:  ## Prepare connecting to Travis instance via SSH.
diff --git a/setup.cfg b/setup.cfg
index d9e629bc..b8e0db42 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 name = vorta
 author = Manuel Riel
 description = A GUI for BorgBackup
-version = 0.6.20
+version = 0.6.21
 url = https://github.com/borgbase/vorta
 keywords =
   backup
diff --git a/src/vorta/_version.py b/src/vorta/_version.py
index 05475519..59e5a0bb 100644
--- a/src/vorta/_version.py
+++ b/src/vorta/_version.py
@@ -1 +1 @@
-__version__ = '0.6.20'
+__version__ = '0.6.21'
diff --git a/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml b/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml
index 550d069f..061d43b2 100644
--- a/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml
+++ b/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml
@@ -4,7 +4,7 @@
   <name>Vorta</name>
   <project_license>GPL-3.0</project_license>
   <metadata_license>CC0-1.0</metadata_license>
-  <content_rating type="oars-1.1" />
+  <content_rating type="oars-1.1"/>
   <summary>Backup client</summary>
   <description>
     <p>
@@ -21,24 +21,24 @@
       <li>Open source – free to use, modify, improve and audit.</li>
       <li>Flexible profiles to group source folders, backup destinations and schedules.</li>
       <li>One place to view all point-in-time archives and restore individual files.</li>
-    </ul>    
+    </ul>
   </description>
   <screenshots>
     <screenshot type="default">
-      <image  height="637" width="800">https://raw.githubusercontent.com/borgbase/vorta/master/src/vorta/assets/metadata/Screenshot-1-Repository.png</image>
+      <image height="637" width="800">https://raw.githubusercontent.com/borgbase/vorta/master/src/vorta/assets/metadata/Screenshot-1-Repository.png</image>
     </screenshot>
     <screenshot type="default">
-      <image  height="637" width="800">https://raw.githubusercontent.com/borgbase/vorta/master/src/vorta/assets/metadata/Screenshot-2-Sources.png</image>
+      <image height="637" width="800">https://raw.githubusercontent.com/borgbase/vorta/master/src/vorta/assets/metadata/Screenshot-2-Sources.png</image>
     </screenshot>
     <screenshot type="default">
-      <image  height="637" width="800">https://raw.githubusercontent.com/borgbase/vorta/master/src/vorta/assets/metadata/Screenshot-3-Schedule.png</image>
+      <image height="637" width="800">https://raw.githubusercontent.com/borgbase/vorta/master/src/vorta/assets/metadata/Screenshot-3-Schedule.png</image>
     </screenshot>
     <screenshot type="default">
-      <image  height="637" width="800">https://raw.githubusercontent.com/borgbase/vorta/master/src/vorta/assets/metadata/Screenshot-4-Archives.png</image>
+      <image height="637" width="800">https://raw.githubusercontent.com/borgbase/vorta/master/src/vorta/assets/metadata/Screenshot-4-Archives.png</image>
     </screenshot>
   </screenshots>
   <releases>
-    <release version="v0.6.20" date="2019-05-16">
+    <release version="v0.6.21" date="2019-06-20">
     </release>
   </releases>
   <url type="homepage">https://github.com/borgbase/vorta</url>
diff --git a/vorta.spec b/vorta.spec
index c814eaf3..26e42964 100644
--- a/vorta.spec
+++ b/vorta.spec
@@ -55,8 +55,8 @@ app = BUNDLE(exe,
              info_plist={
                  'NSHighResolutionCapable': 'True',
                  'LSUIElement': '1',
-                 'CFBundleShortVersionString': '0.6.20',
-                 'CFBundleVersion': '0.6.20',
+                 'CFBundleShortVersionString': '0.6.21',
+                 'CFBundleVersion': '0.6.21',
                  'NSAppleEventsUsageDescription': 'Please allow',
                  'SUFeedURL': 'https://borgbase.github.io/vorta/appcast.xml',
                  'LSEnvironment': {