diff --git a/geo/mapserver/Makefile b/geo/mapserver/Makefile
index 0474b305c36..d00a39d759a 100644
--- a/geo/mapserver/Makefile
+++ b/geo/mapserver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2016/10/31 15:47:58 landry Exp $
+# $OpenBSD: Makefile,v 1.43 2017/02/07 08:17:57 landry Exp $
 
 MULTI_PACKAGES=	-utils -main -php -perl
 
@@ -7,7 +7,7 @@ COMMENT-utils=	mapserver utilities
 COMMENT-php=	PHP Mapscript extension
 COMMENT-perl=	Perl Mapscript binding
 
-V =		7.0.2
+V =		7.0.4
 DISTNAME=	mapserver-${V}
 PKGNAME-main=	${DISTNAME}
 PKGNAME-utils=	mapserver-utils-${V}
diff --git a/geo/mapserver/distinfo b/geo/mapserver/distinfo
index 71ad6f3ea41..59b0e7cd79b 100644
--- a/geo/mapserver/distinfo
+++ b/geo/mapserver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mapserver-7.0.2.tar.gz) = tGvFfV1cOIqghYANMiSTcV+Zue8gaEXRdnvacbUL308=
-SIZE (mapserver-7.0.2.tar.gz) = 2617399
+SHA256 (mapserver-7.0.4.tar.gz) = yR1A2lzCQrIMp+KcQb2esjCXuYp3kIsdcI6XCPb2z2k=
+SIZE (mapserver-7.0.4.tar.gz) = 2624614
diff --git a/geo/mapserver/patches/patch-cmake_FindPHP5_cmake b/geo/mapserver/patches/patch-cmake_FindPHP5_cmake
new file mode 100644
index 00000000000..60ebe66838c
--- /dev/null
+++ b/geo/mapserver/patches/patch-cmake_FindPHP5_cmake
@@ -0,0 +1,15 @@
+$OpenBSD: patch-cmake_FindPHP5_cmake,v 1.1 2017/02/07 08:17:57 landry Exp $
+https://github.com/mapserver/mapserver/commit/8fd1c73d75cd66caa2a04a2da5a7d0390b4b9dd6
+--- cmake/FindPHP5.cmake.orig	Mon Feb  6 14:34:08 2017
++++ cmake/FindPHP5.cmake	Mon Feb  6 14:34:43 2017
+@@ -86,6 +86,10 @@ IF(PHP5_CONFIG_EXECUTABLE)
+ 
+   MESSAGE(STATUS ${PHP5_MAIN_INCLUDE_DIR})
+ 
++  IF(NOT PHP5_INCLUDE_PATH)
++    set(PHP5_INCLUDE_PATH ${PHP5_INCLUDES})
++  ENDIF(NOT PHP5_INCLUDE_PATH)
++
+   IF(PHP5_VERSION LESS 5)
+     MESSAGE(FATAL_ERROR "PHP version is not 5 or later")
+   ENDIF(PHP5_VERSION LESS 5)
diff --git a/geo/mapserver/patches/patch-mapscript_php_error_c b/geo/mapserver/patches/patch-mapscript_php_error_c
deleted file mode 100644
index ae6fd49ef0a..00000000000
--- a/geo/mapserver/patches/patch-mapscript_php_error_c
+++ /dev/null
@@ -1,24 +0,0 @@
-$OpenBSD: patch-mapscript_php_error_c,v 1.1 2016/09/02 15:28:24 landry Exp $
-
-Fix build with php 5.6.25
-
-https://github.com/mapserver/mapserver/issues/5318
-
---- mapscript/php/error.c.orig	Fri Sep  2 17:23:55 2016
-+++ mapscript/php/error.c	Fri Sep  2 17:24:26 2016
-@@ -31,6 +31,15 @@
- 
- #include "php_mapscript.h"
- 
-+#undef ZVAL_STRING
-+#define ZVAL_STRING(z, s, duplicate) do {       \
-+                const char *__s=(s);                            \
-+                zval *__z = (z);                                        \
-+                Z_STRLEN_P(__z) = strlen(__s);          \
-+                Z_STRVAL_P(__z) = (duplicate?estrndup(__s, Z_STRLEN_P(__z)):(char*)__s);\
-+                Z_TYPE_P(__z) = IS_STRING;                      \
-+        } while (0)
-+
- zend_class_entry *mapscript_ce_error;
- 
- ZEND_BEGIN_ARG_INFO_EX(error___get_args, 0, 0, 1)