diff --git a/CHANGELOG b/CHANGELOG
index b84dfb4a0..f023bac97 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,7 @@
                      Changes in version 5.1.1
 --------------------------------------------------------------------------------
 - fix initial creation of postgres database
+- merged changes from 5.0.11
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.0
@@ -36,6 +37,8 @@
 --------------------------------------------------------------------------------
                      Changes in version 5.0.11
 --------------------------------------------------------------------------------
+- merged changes from 4.3.34
+- added some more hooks
 
 --------------------------------------------------------------------------------
                      Changes in version 5.0.10
@@ -117,6 +120,10 @@
 - show both number of links from a document A to B and vise versa in tab header
   on ViewDocuments page
 - add link to duplicate document on ObjectCheck page
+- fix some incompatibilities in sql statements
+- new config parameter maxUploadSize
+- fix document upload by fine-uploader, when using firefox
+- scale default icons for document types, use svg images when available
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.33