diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..b90b54f50
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,10 @@
+# Version NEXT
+
+*
+
+# Version 18.12
+
+* MAM data store compression
+* Proxy protocol support (http://www.haproxy.org/download/1.8/doc/proxy-protocol.txt)
+* MUC Self-Ping optimization (XEP-0410)
+* Bookmarks conversion (XEP-0411)