diff --git a/README_RELEASE.md b/README_RELEASE.md
index b41796b26..21b7275da 100644
--- a/README_RELEASE.md
+++ b/README_RELEASE.md
@@ -4,7 +4,7 @@
 
 1. Get next _version code_ (master branch): `git rev-list HEAD --count master`
 2. Decide on _version name_ (semantic versioning)
-3. Manually update _version code_ and _version name_ in `AndroidManifest.xml` (used by FDroid)
+3. Manually update _version code_ and _version name_ in `build.gradle`
 4. Create changelog (`_version code_.txt`)
 5. Create commit with all changes
 6. Tag newly create commit with _version name_ (e.g., v3.2.1)
diff --git a/build.gradle b/build.gradle
index 36551f739..ab181e0b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,11 +59,14 @@ android {
                 applicationName: "@string/app_name"
         ]
 
-        //Useful for debugging.
-        //versionCode getVersionCode()
+        versionCode 3333
+        //versionCode getVersionCode() //Useful for debugging.
+        versionName "v3.6.1"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
+
+
         minSdkVersion 21
         targetSdkVersion 29
 
diff --git a/fastlane/metadata/android/en-US/changelogs/3333.txt b/fastlane/metadata/android/en-US/changelogs/3333.txt
new file mode 100644
index 000000000..845c8b41f
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/3333.txt
@@ -0,0 +1,4 @@
+v3.6.1: OpenTracks
+
+Bugfix:
+- KMZ import: store correct picture path
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b0acbdcd7..14f5b8035 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sun Apr 12 18:41:12 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 0f252bd7d..026854e4f 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -15,9 +15,7 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.dennisguse.opentracks"
-    android:installLocation="auto"
-    android:versionCode="3330"
-    android:versionName="v3.6.0"> <!-- For FDroid. -->
+    android:installLocation="auto">
     <!-- Permission to initialize services -->
     <application
         android:name=".Startup"