diff --git a/CHANGELOG b/CHANGELOG
index 56b649ce1..87072566b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.29
+--------------------------------------------------------------------------------
+- merge changes up to 5.1.36
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.28
 --------------------------------------------------------------------------------
@@ -289,6 +294,10 @@
 - add document list which can be exported as an archive
 - search results can be exported
 
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.36
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.35
 --------------------------------------------------------------------------------
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 9895311cb..80d744835 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version { /* {{{ */
 
-	const _number = "6.0.28";
+	const _number = "6.0.29";
 	const _string = "SeedDMS";
 
 	function __construct() {