diff --git a/dev-lang/php/patches/php-5.6.4.patch b/dev-lang/php/patches/php-5.6.4.patchset
similarity index 65%
rename from dev-lang/php/patches/php-5.6.4.patch
rename to dev-lang/php/patches/php-5.6.4.patchset
index bfa12e25f..018278b98 100644
--- a/dev-lang/php/patches/php-5.6.4.patch
+++ b/dev-lang/php/patches/php-5.6.4.patchset
@@ -1,22 +1,11 @@
-From a6c749bea2f66db568d9868e302fc030f1ce1980 Mon Sep 17 00:00:00 2001
-From: Augustin Cavalier <waddlesplash@gmail.com>
-Date: Thu, 15 Jan 2015 20:35:37 -0500
-Subject: [PATCH] php: fixes to work on Haiku.
+From c7cb3fd284e68de9a3d13785ff963259fb227285 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 16 Jan 2018 21:32:56 +0100
+Subject: Import old patch: build system.
 
-C code changes by Adrien, build system changes by me.
----
- acinclude.m4             |  2 +-
- aclocal.m4               |  2 +-
- ext/curl/config.m4       |  6 +++---
- ext/date/php_date.c      |  2 --
- ext/gd/config.m4         | 12 ++++++------
- ext/standard/microtime.c |  2 +-
- ext/zip/config.m4        |  8 ++++----
- ext/zlib/config0.m4      | 10 +++++-----
- 8 files changed, 21 insertions(+), 23 deletions(-)
 
 diff --git a/acinclude.m4 b/acinclude.m4
-index 81dc0db..42dca5e 100644
+index 81dc0db..26a00ba 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -762,7 +762,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
@@ -29,7 +18,7 @@ index 81dc0db..42dca5e 100644
    fi
  ])
 diff --git a/aclocal.m4 b/aclocal.m4
-index 189149f..390dd21 100644
+index 189149f..d0f3287 100644
 --- a/aclocal.m4
 +++ b/aclocal.m4
 @@ -762,7 +762,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
@@ -42,7 +31,7 @@ index 189149f..390dd21 100644
    fi
  ])
 diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
-index 2f82c34..07b940e 100644
+index 2f82c34..b6a09d9 100644
 --- a/ext/curl/config.m4
 +++ b/ext/curl/config.m4
 @@ -10,8 +10,8 @@ if test "$PHP_CURL" != "no"; then
@@ -65,24 +54,11 @@ index 2f82c34..07b940e 100644
    fi
  
    CURL_CONFIG="curl-config"
-diff --git a/ext/date/php_date.c b/ext/date/php_date.c
-index bf29a56..17d2446 100644
---- a/ext/date/php_date.c
-+++ b/ext/date/php_date.c
-@@ -33,8 +33,6 @@
- 
- #ifdef PHP_WIN32
- static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; }
--#elif defined(__GNUC__) && __GNUC__ < 3
--static __inline __int64_t php_date_llabs( __int64_t i ) { return i >= 0 ? i : -i; }
- #else
- static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; }
- #endif
 diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
-index 446c242..e81cc94 100644
+index 446c242..c2db008 100644
 --- a/ext/gd/config.m4
 +++ b/ext/gd/config.m4
-@@ -50,12 +50,12 @@ dnl
+@@ -50,23 +50,23 @@ dnl
  
  AC_DEFUN([PHP_GD_ZLIB],[
  	if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
@@ -99,42 +75,48 @@ index 446c242..e81cc94 100644
  		else
  			AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"])
  		fi
-@@ -102,7 +102,7 @@ AC_DEFUN([PHP_GD_JPEG],[
+ 	else
+-		for i in /usr/local /usr; do
+-			if test -f "$i/include/zlib/zlib.h"; then
++		for i in /usr/local /usr /system; do
++			if test -f "$i/develop/headers/zlib/zlib.h"; then
+ 				PHP_ZLIB_DIR="$i"
+-				PHP_ZLIB_INCDIR="$i/include/zlib"
++				PHP_ZLIB_INCDIR="$i/develop/headers/zlib"
+ 			elif test -f "$i/include/zlib.h"; then
+ 				PHP_ZLIB_DIR="$i"
+-				PHP_ZLIB_INCDIR="$i/include"
++				PHP_ZLIB_INCDIR="$i/develop/headers"
+ 			fi
+ 		done
+ 	fi
+@@ -101,8 +101,8 @@ AC_DEFUN([PHP_GD_VPX],[
+ AC_DEFUN([PHP_GD_JPEG],[
    if test "$PHP_JPEG_DIR" != "no"; then
  
-     for i in $PHP_JPEG_DIR /usr/local /usr; do
+-    for i in $PHP_JPEG_DIR /usr/local /usr; do
 -      test -f $i/include/jpeglib.h && GD_JPEG_DIR=$i && break
++    for i in $PHP_JPEG_DIR /usr/local /usr /system; do
 +      test -f $i/develop/headers/jpeglib.h && GD_JPEG_DIR=$i && break
      done
  
      if test -z "$GD_JPEG_DIR"; then
-@@ -127,7 +127,7 @@ AC_DEFUN([PHP_GD_PNG],[
+@@ -126,8 +126,8 @@ AC_DEFUN([PHP_GD_JPEG],[
+ AC_DEFUN([PHP_GD_PNG],[
    if test "$PHP_PNG_DIR" != "no"; then
  
-     for i in $PHP_PNG_DIR /usr/local /usr; do
+-    for i in $PHP_PNG_DIR /usr/local /usr; do
 -      test -f $i/include/png.h && GD_PNG_DIR=$i && break
++    for i in $PHP_PNG_DIR /usr/local /usr /system; do
 +      test -f $i/develop/headers/png.h && GD_PNG_DIR=$i && break
      done
  
      if test -z "$GD_PNG_DIR"; then
-diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
-index fe22366..14298fb 100644
---- a/ext/standard/microtime.c
-+++ b/ext/standard/microtime.c
-@@ -131,7 +131,7 @@ PHP_FUNCTION(getrusage)
- 	array_init(return_value);
- #define PHP_RUSAGE_PARA(a) \
- 		add_assoc_long(return_value, #a, usg.a)
--#if !defined( _OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct */
-+#if !defined( _OSD_POSIX) && !defined(__BEOS__) && !defined(__HAIKU__) /* BS2000 has only a few fields in the rusage struct */
- 	PHP_RUSAGE_PARA(ru_oublock);
- 	PHP_RUSAGE_PARA(ru_inblock);
- 	PHP_RUSAGE_PARA(ru_msgsnd);
 diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
-index a21ad2d..c6dad41 100644
+index a21ad2d..4ef3a98 100644
 --- a/ext/zip/config.m4
 +++ b/ext/zip/config.m4
-@@ -20,12 +20,12 @@ if test "$PHP_ZIP" != "no"; then
+@@ -20,23 +20,23 @@ if test "$PHP_ZIP" != "no"; then
  
    dnl libzip, depends on zlib
    if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
@@ -151,15 +133,92 @@ index a21ad2d..c6dad41 100644
      else
        AC_MSG_ERROR([Can not find zlib headers under "$PHP_ZLIB_DIR"])
      fi
+   else
+-    for i in /usr/local /usr; do
+-      if test -f "$i/include/zlib/zlib.h"; then
++    for i in /usr/local /usr /system; do
++      if test -f "$i/develop/headers/zlib/zlib.h"; then
+         PHP_ZLIB_DIR="$i"
+-        PHP_ZLIB_INCDIR="$i/include/zlib"
+-      elif test -f "$i/include/zlib.h"; then
++        PHP_ZLIB_INCDIR="$i/develop/headers/zlib"
++      elif test -f "$i/develop/headers/zlib.h"; then
+         PHP_ZLIB_DIR="$i"
+-        PHP_ZLIB_INCDIR="$i/include"
++        PHP_ZLIB_INCDIR="$i/develop/headers"
+       fi
+     done
+   fi
+-- 
+2.15.1
+
+
+From 0a937da65315954e409f57d246ec7ddfe6c6f4a5 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 16 Jan 2018 21:34:13 +0100
+Subject: Import old patch: code changes.
+
+
+diff --git a/ext/date/php_date.c b/ext/date/php_date.c
+index bf29a56..17d2446 100644
+--- a/ext/date/php_date.c
++++ b/ext/date/php_date.c
+@@ -33,8 +33,6 @@
+ 
+ #ifdef PHP_WIN32
+ static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; }
+-#elif defined(__GNUC__) && __GNUC__ < 3
+-static __inline __int64_t php_date_llabs( __int64_t i ) { return i >= 0 ? i : -i; }
+ #else
+ static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; }
+ #endif
+diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
+index fe22366..14298fb 100644
+--- a/ext/standard/microtime.c
++++ b/ext/standard/microtime.c
+@@ -131,7 +131,7 @@ PHP_FUNCTION(getrusage)
+ 	array_init(return_value);
+ #define PHP_RUSAGE_PARA(a) \
+ 		add_assoc_long(return_value, #a, usg.a)
+-#if !defined( _OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct */
++#if !defined( _OSD_POSIX) && !defined(__BEOS__) && !defined(__HAIKU__) /* BS2000 has only a few fields in the rusage struct */
+ 	PHP_RUSAGE_PARA(ru_oublock);
+ 	PHP_RUSAGE_PARA(ru_inblock);
+ 	PHP_RUSAGE_PARA(ru_msgsnd);
+-- 
+2.15.1
+
+
+From a1560ad74900a7408fe89df4b4e1719643794f1b Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 16 Jan 2018 21:58:37 +0100
+Subject: More build system fixes
+
+
 diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4
-index ebf67cc..607f6df 100644
+index ebf67cc..b53c7e2 100644
 --- a/ext/zlib/config0.m4
 +++ b/ext/zlib/config0.m4
-@@ -22,12 +22,12 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
+@@ -13,21 +13,22 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
+   PHP_SUBST(ZLIB_SHARED_LIBADD)
+   
+   if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then 
+-    if test -f $PHP_ZLIB/include/zlib/zlib.h; then
++    if test -f $PHP_ZLIB/develop/headers/zlib/zlib.h; then
+       ZLIB_DIR=$PHP_ZLIB
+-      ZLIB_INCDIR=$ZLIB_DIR/include/zlib
+-    elif test -f $PHP_ZLIB/include/zlib.h; then
++      ZLIB_INCDIR=$ZLIB_DIR/develop/headers/zlib
++    elif test -f $PHP_ZLIB/develop/headers/zlib.h; then
+       ZLIB_DIR=$PHP_ZLIB
+-      ZLIB_INCDIR=$ZLIB_DIR/include
++      ZLIB_INCDIR=$ZLIB_DIR/develop/headers
      fi
-   else
-     for i in /usr/local /usr $PHP_ZLIB_DIR; do
+   else 
+-    for i in /usr/local /usr $PHP_ZLIB_DIR; do
 -      if test -f $i/include/zlib/zlib.h; then
++    for i in /usr/local /usr /system $PHP_ZLIB_DIR; do
++	  echo $i
 +      if test -f $i/develop/headers/zlib/zlib.h; then
          ZLIB_DIR=$i
 -        ZLIB_INCDIR=$i/include/zlib
@@ -172,7 +231,7 @@ index ebf67cc..607f6df 100644
        fi
      done
    fi
-@@ -42,7 +42,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
+@@ -42,7 +43,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
    esac
  
    AC_MSG_CHECKING([for zlib version >= 1.2.0.4])
@@ -182,5 +241,5 @@ index ebf67cc..607f6df 100644
    if test `echo $ZLIB_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then
      AC_MSG_ERROR([libz version greater or equal to 1.2.0.4 required])
 -- 
-1.8.3.4
+2.15.1
 
diff --git a/dev-lang/php/php-5.6.4.recipe b/dev-lang/php/php-5.6.4.recipe
index cb2c205bd..42e7dafac 100644
--- a/dev-lang/php/php-5.6.4.recipe
+++ b/dev-lang/php/php-5.6.4.recipe
@@ -10,7 +10,7 @@ REVISION="5"
 SOURCE_URI="https://php.net/get/php-$portVersion.tar.bz2/from/this/mirror"
 CHECKSUM_SHA256="576f9001b612f5ddc22f447311bbec321e2c959b6a52259d664c4ba04ef044f1"
 SOURCE_FILENAME="php-$portVersion.tar.bz2"
-PATCHES="php-$portVersion.patch"
+PATCHES="php-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"