diff --git a/ChangeLog b/ChangeLog
index 2926c9ea1f6..28d2bcb7639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2002-05-07  Sascha Schumann  <sascha@schumann.cx>
+
+    * main/php.h:
+    Due to the thread-safety changes and lots of other stuff, the
+    current tree is not backwards compatible anymore.  Bump API no.
+
+2002-05-07  Jason Greene  <jason@inetgurus.net>
+
+    * ext/sockets/sockets.c: MFH BSD fix
+
+    * ext/sockets/sockets.c: Fix 10830, and 17074
+    FreeBSD requires the exact length of the socket type
+
+2002-05-07  Frank M. Kromann  <frank@frontbase.com>
+
+    * main/spprintf.c: Fixing win32 build.
+
+2002-05-07  Sascha Schumann  <sascha@schumann.cx>
+
+    * main/snprintf.c
+      main/snprintf.h: use thread-safe functions unconditionally
+
+    * main/snprintf.c
+      main/snprintf.h:
+    Add thread-safety to some conversion functions and sync a bit with
+    APR.
+
 2002-05-06  Jason Greene  <jason@inetgurus.net>
 
     * ext/pcntl/pcntl.c: MFH
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 221987242c8..1a9e2828c28 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-07  Andi Gutmans  <andi@zend.com>
+
+    * zend.c
+      zend_builtin_functions.c
+      zend_compile.h
+      zend_execute.c:
+    - More debug backtrace work. It still doesn't work very well...
+
 2002-05-02  Andi Gutmans  <andi@zend.com>
 
     * zend.h