diff --git a/lang/php71/Makefile b/lang/php71/Makefile
index a55e0d416080..0c17aedf3b77 100644
--- a/lang/php71/Makefile
+++ b/lang/php71/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \
 
 USE_GNOME=	libxml2
 
-OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS
+OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM LINKTHR DTRACE
 
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
@@ -57,6 +57,7 @@ DEBUG_DESC=	Enable debug
 PHPDBG_DESC=	Interactive PHP debugger
 DTRACE_DESC=	Enable DTrace support
 IPV6_DESC=	Enable ipv6 support
+MAILHEAD_DESC=	Enable mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
@@ -66,6 +67,13 @@ DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
+PATCH_DIST_STRIP=	-p1
+
+.if ${PORT_OPTIONS:MMAILHEAD}
+PATCHFILES+=	php-5.5.x-mail-header.patch:mail
+PATCH_SITES+=	http://choon.net/opensource/php/:mail
+.endif
+
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli
 .else
diff --git a/lang/php71/distinfo b/lang/php71/distinfo
index fe05af7ed2a3..160b38f85fae 100644
--- a/lang/php71/distinfo
+++ b/lang/php71/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1494835176
 SHA256 (php-7.1.5.tar.xz) = d149a3c396c45611f5dc6bf14be190f464897145a76a8e5851cf18ff7094f6ac
 SIZE (php-7.1.5.tar.xz) = 12797696
+SHA256 (php-7.0.x-mail-header.patch) = 81685dce2d49b146fa1ca2ec6ece2f553757affad7b27b775132f2c71314233c
+SIZE (php-7.0.x-mail-header.patch) = 4394