diff --git a/CHANGELOG.md b/CHANGELOG.md
index a824d4fbd..f6719b893 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ###Changelog
 
+####Version 0.13.6
+* Mi Band 2: Support for multiple alarms (3 at the moment)
+* Mi Band 2: Fix for alarms not working when just one is enabled
+
 ####Version 0.13.5
 * Mi Band 2: Support setting one alarm
 * Pebble: Health compatibility for Firmware 4.2
diff --git a/app/build.gradle b/app/build.gradle
index 0c2d27aee..824a9efbf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         targetSdkVersion 23
 
         // note: always bump BOTH versionCode and versionName!
-        versionName "0.13.5"
-        versionCode 67
+        versionName "0.13.6"
+        versionCode 68
     }
     buildTypes {
         release {
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 0378690b0..6459f6044 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.13.6" versioncode="68">
+        <change>Mi Band 2: Support multiple alarms (3 at the moment)</change>
+        <change>Mi Band 2: Fix for alarms not working when just one is enabled</change>
+    </release>
     <release version="0.13.5" versioncode="67">
         <change>Mi Band 2: Support setting one alarm</change>
         <change>Pebble: Health compatibility for Firmware 4.2</change>