diff --git a/ChangeLog b/ChangeLog
index 1ba68f78ed6..b45c4fb8e37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,100 @@
+2009-04-28  Felipe Pena  <felipensp@gmail.com>
+
+    * tests/classes/inheritance_007.phpt
+      tests/classes/inheritance_007.phpt
+      tests/classes/inheritance_007.phpt:
+      - Fix test
+
+2009-04-28  Stanislav Malyshev  <stas@zend.com>
+
+    * ext/filter/filter.c
+      main/SAPI.c
+      main/SAPI.h
+      main/php_content_types.c:
+      MF5 fix for #47930
+
+2009-04-28  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_5_2)
+      NEWS
+      ext/standard/basic_functions.c
+      ext/standard/basic_functions.c
+      ext/standard/tests/network/ip2long_variation1.phpt
+      ext/standard/tests/network/ip2long_variation1.phpt:
+      
+      MFB: Fixed bug #47365 (ip2long() may allow some invalid values on certain
+      64bit systems)
+
+    * (PHP_5_3)
+      ext/standard/basic_functions.c
+      ext/standard/tests/network/ip2long_variation1.phpt:
+      
+      Fixed bug #47365 (ip2long() may allow some invalid values on certain 64bit
+      systems)
+
+2009-04-28  Stanislav Malyshev  <stas@zend.com>
+
+    * (PHP_5_3)
+      ext/filter/filter.c
+      main/SAPI.c
+      main/SAPI.h
+      main/php_content_types.c:
+      fix for #47930
+
+2009-04-28  Greg Beaver  <greg@chiaraquartet.net>
+
+    * ext/phar/tests/fatal_error_webphar.phpt
+      ext/phar/tests/fatal_error_webphar.phpt
+      ext/phar/tests/files/pear2coverage.phar.php
+      ext/phar/tests/files/pear2coverage.phar.php:
+      
+      file fatal_error_webphar.phpt was initially added on branch PHP_5_3.
+
+2009-04-28  Pierre-Alain Joye  <pierre.dev@gmail.com>
+
+    * (PHP_5_2)
+      NEWS:
+      - mail_criteria entry and revert previous wrong one
+
+2009-04-28  Antony Dovgal  <tony@daylessday.org>
+
+    * ext/standard/tests/strings/strcoll.phpt
+      ext/standard/tests/strings/strcoll.phpt
+      ext/standard/tests/strings/strcoll.phpt
+      tests/classes/inheritance_007.phpt:
+      fix test
+
+    * (PHP_5_2)
+      tests/classes/inheritance_007.phpt:
+      nuke unicode crap, fix test
+
+2009-04-28  Pierre-Alain Joye  <pierre.dev@gmail.com>
+
+    * ext/imap/php_imap.c
+      ext/imap/php_imap.c
+      ext/imap/php_imap.c:
+      - space to tabs
+      - CS
+
+    * ext/imap/php_imap.c
+      ext/imap/php_imap.h:
+      - [DOC] MFB: add imap_gc (purge cache(s) and constants IMAP_GC_ELT,
+      IMAP_GC_ENV and IMAP_GC_TEXTS to control imap_gc behavior
+
+    * (PHP_5_3)
+      ext/imap/php_imap.c
+      ext/imap/php_imap.h:
+      - [DOC] add imap_gc (purge cache(s) and constants IMAP_GC_ELT, IMAP_GC_ENV
+      and IMAP_GC_TEXTS to control imap_gc behavior
+
+2009-04-28  Dmitry Stogov  <dmitry@zend.com>
+
+    * (PHP_5_3)
+      NEWS
+      main/main.c
+      main/main.c:
+      Fixed bug #48034 (PHP crashes when script is 8192 (8KB) bytes long)
+
 2009-04-27  Ilia Alshanetsky  <ilia@prohost.org>
 
     * (PHP_5_3)