diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..d569afc
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,17 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.3.1]
+### Fixed
+- Resolved issue where messages were not being delivered to the MQTT server in time for disconnection.
+
+## [0.3.0] - 2020-04-16
+### Added
+- Support for Home Assistant auto-discovery
+
+
+[Unreleased]: https://github.com/nikdoof/aaisp2mqtt/compare/0.3.0...HEAD
+[0.3.0]: https://github.com/nikdoof/aaisp2mqtt/compare/0.3.0
\ No newline at end of file
diff --git a/aaisp2mqtt.py b/aaisp2mqtt.py
index 79d87a1..498f89a 100644
--- a/aaisp2mqtt.py
+++ b/aaisp2mqtt.py
@@ -14,7 +14,7 @@ import requests
 
 
 LOG = logging.getLogger(__name__)
-VERSION = '0.3.0'
+VERSION = '0.3.1'
 
 AAISP_INFO_URL = 'https://chaos2.aa.net.uk/broadband/info'
 
@@ -162,6 +162,7 @@ def main():
 
     # disconnect
     LOG.info('Disconnecting from MQTT')
+    client.loop()
     client.disconnect()
 
 
diff --git a/setup.py b/setup.py
index 056b8fd..6b6f523 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name='aaisp2mqtt',
-    version='0.3.0',
+    version='0.3.1',
     description='A script to publish Andrews & Arnold / AAISP broadband quota and sync rates to MQTT',
     long_description=long_description,
     long_description_content_type='text/markdown',