diff --git a/php5/scripts/Makefile.frag b/php5/scripts/Makefile.frag

index 632cbb0..c62b56a 100644

--- a/php5/scripts/Makefile.frag

+++ b/php5/scripts/Makefile.frag

@@ -3,8 +3,8 @@

 # Build environment install

 #

-phpincludedir = $(includedir)/php

-phpbuilddir = $(libdir)/build

+phpincludedir = $(includedir)/php/$(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION).$(PHP_RELEASE_VERSION)

+phpbuilddir = $(libdir)/php/$(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION).$(PHP_RELEASE_VERSION)/build

 BUILD_FILES = \

 	scripts/phpize.m4 \

diff --git a/php5/scripts/php-config.in b/php5/scripts/php-config.in

index f7d0bcd..3e2ab3b 100644

--- a/php5/scripts/php-config.in

+++ b/php5/scripts/php-config.in

@@ -5,7 +5,7 @@ prefix="@prefix@"

 exec_prefix="@exec_prefix@"

 version="@PHP_VERSION@"

 vernum="@PHP_VERSION_ID@"

-include_dir="@includedir@/php"

+include_dir="@includedir@/php/@PHP_MAJOR_VERSION@.@PHP_MINOR_VERSION@.@PHP_RELEASE_VERSION@"

 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 --git a/php5/scripts/phpize.in b/php5/scripts/phpize.in

index 35f7dc7..1343d1d 100644

--- a/php5/scripts/phpize.in

+++ b/php5/scripts/phpize.in

@@ -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@`/php/@PHP_MAJOR_VERSION@.@PHP_MINOR_VERSION@.@PHP_RELEASE_VERSION@/build"

+includedir="`eval echo @includedir@`/php/@PHP_MAJOR_VERSION@.@PHP_MINOR_VERSION@.@PHP_RELEASE_VERSION@"

 builddir="`pwd`"

 SED="@SED@"