diff --git a/dev-lang/php/php-7.0.7-r1.ebuild b/dev-lang/php/php-7.0.7-r1.ebuild
index a4bf49a..cbe9235 100644
--- a/dev-lang/php/php-7.0.7-r1.ebuild
+++ b/dev-lang/php/php-7.0.7-r1.ebuild
@@ -136,7 +136,7 @@ DEPEND="${DEPEND}
 		!libressl? ( dev-libs/openssl:0 )
 		libressl? ( dev-libs/libressl )
 	)
-	tidy? ( app-text/htmltidy )
+	tidy? ( app-text/tidy-html5 )
 	truetype? (
 		=media-libs/freetype-2*
 		!gd? (
@@ -295,6 +295,15 @@ src_prepare() {
 			|| die "Failed to fix heimdal crypt library reference"
 	fi
 
+	# We need to change "buffio.h" to "tidybuffio.h" in ext/tidy/tidy.c
+	# in order to support the newer tidy-html5 library (as opposed to
+	# htmltidy). This tip is provided in tidy-html5's README at,
+	#
+	#   https://github.com/htacg/tidy-html5/tree/master/README
+	#
+	sed -i 's/#include "buffio.h"/#include "tidybuffio.h"/' ext/tidy/tidy.c \
+		|| die "failed to patch ext/tidy/tidy.c for the tidy-html5 library"
+
 	# Add user patches #357637
 	epatch_user