diff --git a/www/php5/patches/patch-configure_in b/www/php5/patches/patch-configure_in
index 6beba10ae67..3225091ae41 100644
--- a/www/php5/patches/patch-configure_in
+++ b/www/php5/patches/patch-configure_in
@@ -1,6 +1,25 @@
-$OpenBSD: patch-configure_in,v 1.10 2007/09/05 09:11:34 robert Exp $
+$OpenBSD: patch-configure_in,v 1.11 2008/04/05 05:45:19 sturm Exp $
 --- configure.in.orig	Wed Sep  5 10:38:41 2007
 +++ configure.in	Wed Sep  5 10:39:20 2007
++@@ -325,13 +325,13 @@ AC_CHECK_LIB(m, sin)
++
++ dnl Check for resolver routines.
++ dnl Need to check for both res_search and __res_search
++-dnl in -lc, -lbind, -lresolv and -lsocket
++-PHP_CHECK_FUNC(res_search, resolv, bind, socket)
+++dnl in -lc, -lresolv and -lsocket
+++PHP_CHECK_FUNC(res_search, resolv, socket)
++
++ dnl Check for inet_aton and dn_skipname
++-dnl in -lc, -lbind and -lresolv
++-PHP_CHECK_FUNC(inet_aton, resolv, bind)
++-PHP_CHECK_FUNC(dn_skipname, resolv, bind)
+++dnl in -lc and -lresolv
+++PHP_CHECK_FUNC(inet_aton, resolv)
+++PHP_CHECK_FUNC(dn_skipname, resolv)
++
++
++ dnl Then headers.
 @@ -893,7 +893,7 @@ enable_static=yes
  
  case $php_build_target in
diff --git a/www/php5/patches/patch-ext_standard_config_m4 b/www/php5/patches/patch-ext_standard_config_m4
new file mode 100644
index 00000000000..a41da896c7f
--- /dev/null
+++ b/www/php5/patches/patch-ext_standard_config_m4
@@ -0,0 +1,16 @@
+$OpenBSD: patch-ext_standard_config_m4,v 1.1 2008/04/05 05:45:19 sturm Exp $
+--- ext/standard/config.m4.orig	Fri Apr  4 22:34:19 2008
++++ ext/standard/config.m4	Fri Apr  4 22:34:33 2008
+@@ -311,9 +311,9 @@ dnl
+ dnl Detect library functions needed by php dns_xxx functions
+ dnl ext/standard/dns.h will collect these in a single define: HAVE_DNS_FUNCS
+ dnl
+-PHP_CHECK_FUNC(res_nmkquery, resolv, bind, socket)
+-PHP_CHECK_FUNC(res_nsend, resolv, bind, socket)
+-PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
++PHP_CHECK_FUNC(res_nmkquery, resolv, socket)
++PHP_CHECK_FUNC(res_nsend, resolv, socket)
++PHP_CHECK_FUNC(dn_expand, resolv, socket)
+ 
+ dnl
+ dnl Check if atof() accepts NAN