diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6f7ccdf1..2eabecee4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ### Changelog
 
-#### NEXT
+#### Version 0.36.0
 * Initial Mijia LYWSD02 support (Smart Clock with Humidity and Temperature Sensor), just for setting the time
 * Mi Band 3/4: Allow enabling the NFC menu where supported (useless for now)
 * Mi Band 3/4, Amazfit Cor/Bip: Set language immediately when changing it (not only on connect)
@@ -11,6 +11,7 @@
 * Amazfit Bip/Cor: Fix resetting of last fetched date for sports activities
 * Amazfit Bip: Fix sharing GPX files for some Apps
 * Pebble: Use Rebble Store URI
+* Support LineageOS 16.0 weather provider
 * Add Averages to Charts
 * Allow togging between weekly and monthly charts
 
diff --git a/app/build.gradle b/app/build.gradle
index 64749243b..60cfbf04e 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.35.2"
-        versionCode 154
+        versionName "0.36.0"
+        versionCode 155
         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 bb136ae81..8de96c4ff 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.36.0" versioncode="155">
+      <change>Initial Mijia LYWSD02 support (Smart Clock with Humidity and Temperature Sensor), just for setting the time</change>
+      <change>Mi Band 3/4: Allow enabling the NFC menu where supported (useless for now)</change>
+      <change>Mi Band 3/4, Amazfit Cor/Bip: Set language immediately when changing it (not only on connect)</change>
+      <change>Mi Band 3/4, Amazfir Cor/Bip: Add icons for "swimming" and "exercise"</change>
+      <change>Mi Band 4: Support flashing the V2 font</change>
+      <change>Mi Band 4: Fix weather location not being updated on the Band</change>
+      <change>Mi Band 4: remove unsupported DND setting from settings menu</change>
+      <change>Amazfit Bip/Cor: Fix resetting of last fetched date for sports activities</change>
+      <change>Amazfit Bip: Fix sharing GPX files for some Apps</change>
+      <change>Pebble: Use Rebble Store URI</change>
+      <change>Support LineageOS 16.0 weather provider</change>
+      <change>Add Averages to Charts</change>
+      <change>Allow togging between weekly and monthly charts</change>
+    </release>
     <release version="0.35.2" versioncode="154">
         <change>Mi Band 1/2: Crash when updating firmware while phone is set to Spanish</change>
         <change>Mi Band 4: Enable music info support (displays now on the band)</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/155.txt b/fastlane/metadata/android/en-US/changelogs/155.txt
new file mode 100644
index 000000000..e90ce4900
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/155.txt
@@ -0,0 +1,13 @@
+* Initial Mijia LYWSD02 support (Smart Clock with Humidity and Temperature Sensor), just for setting the time
+* Mi Band 3/4: Allow enabling the NFC menu where supported (useless for now)
+* Mi Band 3/4, Amazfit Cor/Bip: Set language immediately when changing it (not only on connect)
+* Mi Band 3/4, Amazfir Cor/Bip: Add icons for "swimming" and "exercise"
+* Mi Band 4: Support flashing the V2 font
+* Mi Band 4: Fix weather location not being updated on the Band
+* Mi Band 4: remove unsupported DND setting from settings menu
+* Amazfit Bip/Cor: Fix resetting of last fetched date for sports activities
+* Amazfit Bip: Fix sharing GPX files for some Apps
+* Pebble: Use Rebble Store URI
+* Support LineageOS 16.0 weather provider
+* Add Averages to Charts
+* Allow togging between weekly and monthly charts