diff --git a/ChangeLog b/ChangeLog
index fee20e91da3..4bd72e513b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,70 @@
+2007-03-12  Antony Dovgal  <antony@zend.com>
+
+    * (PHP_5_2)
+      ext/standard/string.c:
+      return false instead of empty string when -length is greater than (len -
+      offset)
+
+2007-03-12  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_5_2)
+      ext/interbase/php_ibase_udf.c:
+      
+      malloc() -> pemalloc()
+
+2007-03-12  Antony Dovgal  <antony@zend.com>
+
+    * ext/standard/uuencode.c:
+      fix folding and add missing footer
+
+    * (PHP_5_2)
+      ext/iconv/iconv.c
+      ext/iconv/tests/iconv_substr.phpt:
+      synchronize iconv_substr() behavior with substr()
+      no MFB so far, since substr() changes are not MFBed either
+
+2007-03-12  Dmitry Stogov  <dmitry@zend.com>
+
+    * ZendEngine2/tests/bug40770.phpt
+      ZendEngine2/tests/bug40770.phpt:
+      
+      file bug40770.phpt was initially added on branch PHP_5_2.
+
+    * (PHP_5_2)
+      NEWS
+      ZendEngine2/zend_alloc.c
+      ZendEngine2/zend_alloc.c
+      ZendEngine2/tests/bug40770.phpt:
+      Fixed bug #40770 (Apache child exits when PHP memory limit reached)
+
+2007-03-12  Antony Dovgal  <antony@zend.com>
+
+    * (PHP_5_2)
+      NEWS:
+      BFN
+
+    * (PHP_5_2)
+      ZendEngine2/zend_compile.c
+      ZendEngine2/tests/bug40784.phpt:
+      MFH: fix #40784 (Case sensivity in constructor's fallback)
+
+    * ZendEngine2/zend_compile.c
+      ZendEngine2/tests/bug40784.phpt
+      ZendEngine2/tests/bug40784.phpt:
+      fix #40784 (Case sensivity in constructor's fallback)
+
+2007-03-12  Dmitry Stogov  <dmitry@zend.com>
+
+    * sapi/cgi/fastcgi.c
+      sapi/cgi/fastcgi.c:
+      Fixed compilation warning
+
+2007-03-12  Edin Kadribasic  <edin@krug.dk>
+
+    * (PHP_5_2)
+      NEWS:
+      Lib upgrade news
+
 2007-03-11  Ilia Alshanetsky  <ilia@prohost.org>
 
     * (PHP_5_2)
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index c8c298a1c26..a892fb87bc0 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,27 @@
+2007-03-12  Dmitry Stogov  <dmitry@zend.com>
+
+    * zend_alloc.c
+      zend_alloc.c
+      tests/bug40770.phpt:
+      Fixed bug #40770 (Apache child exits when PHP memory limit reached)
+
+    * tests/bug40770.phpt
+      tests/bug40770.phpt:
+      
+      file bug40770.phpt was initially added on branch PHP_5_2.
+
+2007-03-12  Antony Dovgal  <antony@zend.com>
+
+    * (PHP_5_2)
+      zend_compile.c
+      tests/bug40784.phpt:
+      MFH: fix #40784 (Case sensivity in constructor's fallback)
+
+    * zend_compile.c
+      tests/bug40784.phpt
+      tests/bug40784.phpt:
+      fix #40784 (Case sensivity in constructor's fallback)
+
 2007-03-08  Stanislav Malyshev  <stas@zend.com>
 
     * zend_vm_def.h