diff --git a/CHANGELOG b/CHANGELOG
index 21477f1d7..4326b33b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,10 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.11
 --------------------------------------------------------------------------------
+- merge changes up to 5.1.18
 - fix access restriction for roles (content of documents was visible even if the
   role and status didn't allow it)
+- fix missing Content-Type in UserList (Closes: #480)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.10