diff -Naur php-5.3.6/configure.in php-5.3.6.oden/configure.in
--- php-5.3.6/configure.in	2011-03-18 16:27:06.328229734 +0100
+++ php-5.3.6.oden/configure.in	2011-03-18 16:27:18.693520969 +0100
@@ -1,7 +1,7 @@
 ## $Id: configure.in 309329 2011-03-17 07:48:29Z johannes $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
-divert(1)
+divert(1001)
 
 dnl ## Diversion 1 is the autoconf + automake setup phase. We also
 dnl ## set the PHP version, deal with platform-specific compile
@@ -288,7 +288,7 @@
 
 sinclude(main/suhosin_patch.m4)
 
-divert(2)
+divert(1002)
 
 dnl ## Diversion 2 is where we set PHP-specific options and come up
 dnl ## with reasonable default values for them. We check for pthreads here
@@ -327,7 +327,7 @@
   PTHREADS_FLAGS
 fi
 
-divert(3)
+divert(1003)
 
 dnl ## In diversion 3 we check for compile-time options to the PHP
 dnl ## core and how to deal with different system dependencies. 
@@ -673,7 +673,7 @@
   PHP_CRYPT_R_STYLE
 fi
 
-divert(4)
+divert(1004)
 
 dnl ## In diversion 4 we check user-configurable general settings.
 
@@ -914,7 +914,7 @@
   AC_MSG_RESULT([using system default])
 fi
 
-divert(5)
+divert(1005)
 
 dnl ## In diversion 5 we check which extensions should be compiled.
 dnl ## All of these are normally in the extension directories.
diff -Naur php-5.3.6/ext/standard/config.m4 php-5.3.6.oden/ext/standard/config.m4
--- php-5.3.6/ext/standard/config.m4	2010-06-17 12:22:03.000000000 +0200
+++ php-5.3.6.oden/ext/standard/config.m4	2011-03-18 16:27:18.693520969 +0100
@@ -1,6 +1,6 @@
 dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- autoconf -*-
 
-divert(3)dnl
+divert(1003)dnl
 
 dnl
 dnl Check if flush should be called explicitly after buffered io
@@ -342,7 +342,7 @@
 AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy)
 AC_FUNC_FNMATCH	
 
-divert(5)dnl
+divert(1005)dnl
 
 dnl
 dnl Check if there is a support means of creating a new process
diff -Naur php-5.3.6/scripts/phpize.m4 php-5.3.6.oden/scripts/phpize.m4
--- php-5.3.6/scripts/phpize.m4	2010-11-02 10:58:08.000000000 +0100
+++ php-5.3.6.oden/scripts/phpize.m4	2011-03-18 16:27:18.693520969 +0100
@@ -1,6 +1,6 @@
 dnl This file becomes configure.in for self-contained extensions.
 
-divert(1)
+divert(1001)
 
 AC_PREREQ(2.13)
 AC_INIT(config.m4)