diff -Naur php-4.4.0RC1/main/php_ini.c php-4.4.0RC1.oden/main/php_ini.c
--- php-4.4.0RC1/main/php_ini.c	2004-09-17 04:49:48.000000000 +0200
+++ php-4.4.0RC1.oden/main/php_ini.c	2005-06-14 20:25:03.792870275 +0200
@@ -382,7 +382,7 @@
 		}
 		/* Search php-%sapi-module-name%.ini file in search path */
 		if (!fh.handle.fp) {
-			const char *fmt = "php-%s.ini";
+			const char *fmt = "php4-%s.ini";
 			char *ini_fname = emalloc(strlen(fmt) + strlen(sapi_module.name));
 			sprintf(ini_fname, fmt, sapi_module.name);
 			fh.handle.fp = php_fopen_with_path(ini_fname, "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
@@ -393,7 +393,7 @@
 		}
 		/* Search php.ini file in search path */
 		if (!fh.handle.fp) {
-			fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
+			fh.handle.fp = php_fopen_with_path("php4.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
 			if (fh.handle.fp) {
 				fh.filename = php_ini_opened_path;
 			}
diff -Naur php-4.4.0RC1/scripts/Makefile.frag php-4.4.0RC1.oden/scripts/Makefile.frag
--- php-4.4.0RC1/scripts/Makefile.frag	2005-06-14 20:27:23.215997676 +0200
+++ php-4.4.0RC1.oden/scripts/Makefile.frag	2005-06-14 20:25:03.792870275 +0200
@@ -3,8 +3,8 @@
 # Build environment install
 #
 
-phpincludedir = $(includedir)/php
-phpbuilddir = $(libdir)/php/build
+phpincludedir = $(includedir)/php4
+phpbuilddir = $(libdir)/php4/build
 
 BUILD_FILES = \
 	scripts/phpize.m4 \
diff -Naur php-4.4.0RC1/scripts/php-config.in php-4.4.0RC1.oden/scripts/php-config.in
--- php-4.4.0RC1/scripts/php-config.in	2005-03-16 07:37:03.000000000 +0100
+++ php-4.4.0RC1.oden/scripts/php-config.in	2005-06-14 20:25:03.793870298 +0200
@@ -2,7 +2,7 @@
 
 prefix="@prefix@"
 version="@PHP_VERSION@"
-includedir="@includedir@/php"
+includedir="@includedir@/php4"
 includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend"
 ldflags="@PHP_LDFLAGS@"
 libs="@EXTRA_LIBS@"
diff -Naur php-4.4.0RC1/scripts/phpize.in php-4.4.0RC1.oden/scripts/phpize.in
--- php-4.4.0RC1/scripts/phpize.in	2005-06-14 20:27:23.246998371 +0200
+++ php-4.4.0RC1.oden/scripts/phpize.in	2005-06-14 20:25:29.272441848 +0200
@@ -4,8 +4,8 @@
 EGREP='@EGREP@'
 prefix='@prefix@'
 exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/php/build"
-includedir="`eval echo @includedir@`/php"
+phpdir="`eval echo @libdir@`/php4/build"
+includedir="`eval echo @includedir@`/php4"
 builddir="`pwd`"
 export WANT_AUTOCONF_2_5="1"
 
diff -Naur php-4.4.0RC1/scripts/phpize.m4 php-4.4.0RC1.oden/scripts/phpize.m4
--- php-4.4.0RC1/scripts/phpize.m4	2005-06-14 20:27:23.247998393 +0200
+++ php-4.4.0RC1.oden/scripts/phpize.m4	2005-06-14 20:25:03.793870298 +0200
@@ -5,11 +5,11 @@
 PHP_INIT_BUILD_SYSTEM
 
 AC_DEFUN([PHP_WITH_PHP_CONFIG],[
-  AC_ARG_WITH(php-config,
-[  --with-php-config=PATH],[
+  AC_ARG_WITH(php4-config,
+[  --with-php4-config=PATH],[
   PHP_CONFIG=$withval
 ],[
-  PHP_CONFIG=php-config
+  PHP_CONFIG=php4-config
 ])
 
   prefix=`$PHP_CONFIG --prefix 2>/dev/null`
@@ -17,7 +17,7 @@
   EXTENSION_DIR=`$PHP_CONFIG --extension-dir`
  
   if test -z "$prefix"; then
-    AC_MSG_ERROR(Cannot find php-config. Please use --with-php-config=PATH)
+    AC_MSG_ERROR(Cannot find php4-config. Please use --with-php4-config=PATH)
   fi
   AC_MSG_CHECKING(for PHP prefix)
   AC_MSG_RESULT($prefix)