diff --git a/CHANGELOG b/CHANGELOG
index cb26a0148def20bd57295309e25d64b3bc39c418..85156b159c8346f9739e2cbe3807d119352daf1e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+minerva (12.0.0~beta.6) unstable; urgency=medium
+  * Bug fix: touch devices - long click handler sometimes was fired when not
+    necessary
+  * Bug fix: removing comments didn't work
+  * Bug fix: plugins - maps using open layers were squeezed after load of first
+    plugin
+  * Bug fix: plugins - highlights of surfaces didn't work
+  * Bug fix: problem with upload complex maps with case sensitive names
+  * Bug fix: problem with upload complex maps with links to submaps in separate
+    directory
+  * Bug fix: user without privileges cannot click on edit/save/remove buttons
+    in maps/configuration options
+  * Bug fix: adding comment doesn't show it on map when no comments are visible
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Fri, 28 Jun 2018 15:30:00 +0200
+
 minerva (12.0.0~beta.5) unstable; urgency=medium
   * Bug fix: upload of data overlay stopped working
   * Bug fix: there was a question about Terms of Use when ToU was undefined