diff --git a/Changelog.md b/Changelog.md
index fd4ea2911d..a1518fec6a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+## 3.6.1 (June 2017)
+- Fix bug that restarted log-in process on two-factor authentication environments when app passcode was set
+
 ## 3.6.0 (May 2017)
 - Video streaming
 - Multiple public links per file (OC X required)
diff --git a/OC Share Sheet/Info.plist b/OC Share Sheet/Info.plist
index 293a89c838..e1d1e1b3e4 100644
--- a/OC Share Sheet/Info.plist	
+++ b/OC Share Sheet/Info.plist	
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.0</string>
+	<string>3.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Owncloud iOs Client/Owncloud iOs Client-Info.plist b/Owncloud iOs Client/Owncloud iOs Client-Info.plist
index 13db435457..4744ed4e6b 100644
--- a/Owncloud iOs Client/Owncloud iOs Client-Info.plist	
+++ b/Owncloud iOs Client/Owncloud iOs Client-Info.plist	
@@ -61,7 +61,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.0</string>
+	<string>3.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/Owncloud iOs ClientTests/Owncloud iOs ClientTests-Info.plist b/Owncloud iOs ClientTests/Owncloud iOs ClientTests-Info.plist
index cee4c340e6..fbe418315b 100644
--- a/Owncloud iOs ClientTests/Owncloud iOs ClientTests-Info.plist	
+++ b/Owncloud iOs ClientTests/Owncloud iOs ClientTests-Info.plist	
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.0</string>
+	<string>3.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/ownCloudExtApp/Info.plist b/ownCloudExtApp/Info.plist
index 571b4fc7d3..e911ca0a42 100644
--- a/ownCloudExtApp/Info.plist
+++ b/ownCloudExtApp/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.0</string>
+	<string>3.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/ownCloudExtAppFileProvider/Info.plist b/ownCloudExtAppFileProvider/Info.plist
index cb8b36559f..15f0d2910d 100644
--- a/ownCloudExtAppFileProvider/Info.plist
+++ b/ownCloudExtAppFileProvider/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.0</string>
+	<string>3.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>