diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..1ef03fd
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,24 @@
+# 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).
+
+## [Unreleased]
+
+## [0.1.3] - 2018-12-14
+### Fixed
+- Fix a problem where user deletion or avatar change would fail if a user account did not have a mail account.
+
+## [0.1.2] - 2018-12-14
+### Added
+- Compatibility with Nextcloud 15
+
+## [0.1.1] - 2018-10-15
+### Added
+- Compatibility with Nextcloud 14
+
+## [0.1.0] - 2018-06-07
+### Added
+- Initial release
+
diff --git a/README.md b/README.md
index bea73a5..15c7520 100644
--- a/README.md
+++ b/README.md
@@ -48,14 +48,3 @@ Afaics the mail app has no mechanism to delete
 This means that if you delete a user, while his mail account and aliases will be deleted, his collected addresses and attachment references will remain in the db. This is not the *Auto Mail Account* app's fault.
 
 This data can be found in the `oc_mail_attachments` and `oc_mail_collected_addresses` tables respectively.
-
-        
-## Changelog
-### 0.1.3
-- Fix a problem where user deletion or avatar change would fail if a user account did not have a mail account.
-### 0.1.2
-- Add compatibility with Nextcloud 15
-### 0.1.1
-- Add compatibility with Nextcloud 14
-### 0.1.0
-- Initial release
\ No newline at end of file