diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..ac4fbd57
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,25 @@
+Changelog
+=========
+
+0.1.1
+-----
+
+* Removed unnecessary print commands
+* Created the documentation
+
+0.1.0
+-----
+
+* Supports encrypted journals using AES encryption
+* Support external editors for composing entries
+
+0.0.2
+-----
+
+* Filtering by tags and dates
+* Now using dedicated classes for Journals and entries
+
+0.0.1
+-----
+
+* Composing entries works. That's pretty much it.
\ No newline at end of file