diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbc14535..5bb6019b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,13 @@
 ###Changelog
 
-####Version 0.9.0 (next)
+####Version 0.9.0
 * Pebble: Support for configuring watchfaces/apps locally (clay) or though webbrowser (some do not work)
 * Pebble: hide the alarm management activity as it's unsupported
 * Mi Band: Improve firmware detection and updates, including 1S support
 * Mi Band: Display HR FW for 1S
 * FW and HW versions are only displayed after tapping on the "info" button in Control Center
 * Do not display activity samples when navigating too far in the past
+* Fix auto connect which was broken under some circumstances
 
 ####Version 0.8.2
 * Fix database creation and updates (thanks @feclare)
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index b101eae9..71f48881 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -7,6 +7,7 @@
         <change>Mi Band: Display HR FW for 1S</change>
         <change>FW and HW versions are only displayed after tapping on the "info" button in Control Center</change>
         <change>Do not display activity samples when navigating too far in the past</change>
+        <change>Fix auto connect which was broken under some circumstances</change>
     </release>
     <release version="0.8.2" versioncode="43">
         <change>Add experimental widget to set the alarm time to a configurable number of hours in the future</change>