diff --git a/ChangeLog b/ChangeLog
index 6d9377501bc..7d59dd714e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2005-05-22  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_4_3)
+      NEWS
+      Zend/zend_highlight.c
+      ZendEngine2/zend_highlight.c
+      tests/strings/004.phpt:
+      MFH: Fixed bug #29338 (unencoded spaces get ignored after certain tags).
+
+    * tests/strings/004.phpt:
+      Adjust highlight test.
+
+    * ZendEngine2/zend_highlight.c:
+      Fixed bug #29338 (unencoded spaces get ignored after certain tags).
+
+2005-05-22  Antony Dovgal  <tony2001@phpclub.net>
+
+    * ext/session/session.c:
+      fix compile warning
+
+2005-05-22  Stanislav Malyshev  <stas@zend.com>
+
+    * (PHP_4_3)
+      Zend/zend.c
+      ZendEngine2/zend.c
+      ZendEngine2/zend.c:
+      fix leak
+
 2005-05-21  Rasmus Lerdorf  <rasmus@lerdorf.com>
 
     * (PHP_4_3)
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 6ec499cebfb..7c0a9d2d9d6 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,18 @@
+2005-05-22  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_5_0)
+      zend_highlight.c:
+      MFH: Fixed bug #29338 (unencoded spaces get ignored after certain tags).
+
+    * zend_highlight.c:
+      Fixed bug #29338 (unencoded spaces get ignored after certain tags).
+
+2005-05-22  Stanislav Malyshev  <stas@zend.com>
+
+    * zend.c
+      zend.c:
+      fix leak
+
 2005-05-19  Dmitry Stogov  <dmitry@zend.com>
 
     * (PHP_5_0)