diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..7cbb892
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,22 @@
+# ChangeLog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/).
+
+## [Unreleased]
+...
+
+## [1.8.4.2] - 2017-03-29
+### Added
+- Add feature to return only non-expired entries (#304 @schrauger)
+
+### Fixed
+- Fixed exception System.ArgumentOutOfRangeException: Index was out of range (#273 @VladimirSerykh)
+
+## [1.8.4.1] - 2016-03-22
+### Added
+- Make the limitation that only advanced string fields starting with "KPH: " are returned optional (#232 @berrnd)
+- Ability to change listener host (#217 @frankhommers)
+
+## [1.8.4.0 and earlier releases]
+See: https://github.com/pfn/keepasshttp/commits/master