diff --git a/CHANGELOG.md b/CHANGELOG.md
index e98f19382..bccc31199 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ### Changelog
 
+#### Version 0.26.1
+* Fix crashes and connection problems on Android 6 and lower
+
 #### Version 0.26.0
 * Amazfit Bip: Initial support for GPS tracks
 * Pebble: Wind speed/direction support and bugfixes for weather when using background javascript
diff --git a/app/build.gradle b/app/build.gradle
index 1442600b1..484342abd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,8 +25,8 @@ android {
         targetSdkVersion 27
 
         // Note: always bump BOTH versionCode and versionName!
-        versionName "0.26.0"
-        versionCode 126
+        versionName "0.26.1"
+        versionCode 127
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 5a3f87e31..de786572d 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.26.1" versioncode="127">
+        <change> Fix crashes on connection problems on Android 6 and lower</change>
+    </release>
     <release version="0.26.0" versioncode="126">
         <change>Amazfit Bip: Initial support for GPS tracks</change>
         <change>Pebble: Wind speed/direction support and bugfixes for weather when using background javascript</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/127.txt b/fastlane/metadata/android/en-US/changelogs/127.txt
new file mode 100644
index 000000000..dd694e5b9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/127.txt
@@ -0,0 +1 @@
+* Fix crashes and connection problems on Android 6 and lower