diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5972c61..cc41b65 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,59 @@
-glusterfs
+=========
+Changelog
 =========
 
-0.1 (2015-07-30)
+Version 2017.3
+=============================
 
-- initial release
+commit 9b0b4d7ff1509d90f2ea8621fe2379702716cb81 (HEAD -> master)
+Author: Filip Pytloun <filip@pytloun.cz>
+
+    Fix version metadata
+
+commit ef53a36a8e019b28d9fe4ac87ee9a4671b525b61 (origin/master, origin/HEAD)
+Author: Filip Pytloun <filip@pytloun.cz>
+
+    Fix comparison of salt version
+
+commit e408fe46aeebc5533bf425a9508fe8804d2cd9b7
+Author: Filip Pytloun <filip@pytloun.cz>
+
+    Fix timeout option
+
+commit 734b103314322da4b1501f61d734a3a37c697aba
+Author: Filip Pytloun <filip@pytloun.cz>
+
+    Raise timeout for mounting glusterfs
+
+commit eff752556a8c4c3ff63925ccee99b4fac965c51b
+Author: Filip Pytloun <filip@pytloun.cz>
+
+    Install attr to make client more happy
+
+commit 2305402379d794b62d544a92b0017d64d1a246fb
+Author: Filip Pytloun <filip@pytloun.cz>
+
+    Wait for a while when peers are probed
+
+commit 04d04389a7540dbb81d54261dde6b1b21c5fb7aa
+Author: Filip Pytloun <filip@pytloun.cz>
+
+    Use systemd mount where possible
+
+commit 251a2dd661e601877bafbd9b75269662c184398c (tag: mcp0.5)
+Author: Filip Pytloun <filip@pytloun.cz>
+
+    Unify Makefile, .gitignore and update readme
+
+Version 2016.12.1
+=============================
+
+commit 585b31c09e6eeb9d4ccfe2fc768132757978da42 (tag: mk22-sl, tag: 2016.12.1)
+Author: Filip Pytloun <filip@pytloun.cz>
+
+    Include volumes in docs generation
+
+Version 2016.12
+=============================
+
+