diff -Naur php-5.2.4/configure.in php-5.2.4-magellan/configure.in
--- php-5.2.4/configure.in	2007-08-30 01:36:11.000000000 +0200
+++ php-5.2.4-magellan/configure.in	2007-09-07 20:34:03.000000000 +0200
@@ -1023,7 +1023,7 @@
 
 case $libdir in
   '${exec_prefix}/lib')
-    libdir=$libdir/php
+    libdir=$libdir/php5
     ;;
 esac
 case $datadir in
diff -Naur php-5.2.4/scripts/Makefile.frag php-5.2.4-magellan/scripts/Makefile.frag
--- php-5.2.4/scripts/Makefile.frag	2005-11-22 00:08:02.000000000 +0100
+++ php-5.2.4-magellan/scripts/Makefile.frag	2007-09-07 20:34:53.000000000 +0200
@@ -3,8 +3,8 @@
 # Build environment install
 #
 
-phpincludedir = $(includedir)/php
-phpbuilddir = $(libdir)/build
+phpincludedir = $(includedir)/php5
+phpbuilddir = $(libdir)/php5/build
 
 BUILD_FILES = \
 	scripts/phpize.m4 \
diff -Naur php-5.2.4/scripts/php-config.in php-5.2.4-magellan/scripts/php-config.in
--- php-5.2.4/scripts/php-config.in	2007-08-24 13:44:10.000000000 +0200
+++ php-5.2.4-magellan/scripts/php-config.in	2007-09-07 20:35:12.000000000 +0200
@@ -5,7 +5,7 @@
 exec_prefix="@exec_prefix@"
 version="@PHP_VERSION@"
 vernum="@PHP_VERSION_ID@"
-include_dir="@includedir@/php"
+include_dir="@includedir@/php5"
 includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
 ldflags="@PHP_LDFLAGS@"
 libs="@EXTRA_LIBS@"
diff -Naur php-5.2.4/scripts/phpize.in php-5.2.4-magellan/scripts/phpize.in
--- php-5.2.4/scripts/phpize.in	2007-06-29 03:10:35.000000000 +0200
+++ php-5.2.4-magellan/scripts/phpize.in	2007-09-07 20:35:49.000000000 +0200
@@ -3,8 +3,8 @@
 # Variable declaration
 prefix='@prefix@'
 exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
-includedir="`eval echo @includedir@`/php"
+phpdir="`eval echo @libdir@`/php5/build"
+includedir="`eval echo @includedir@`/php5"
 builddir="`pwd`"
 SED="@SED@"