diff -Nru debhelper-9.20160115ubuntu2/debian/changelog debhelper-9.20160115ubuntu3/debian/changelog
--- debhelper-9.20160115ubuntu2/debian/changelog	2016-01-20 06:58:59.000000000 +0000
+++ debhelper-9.20160115ubuntu3/debian/changelog	2016-03-31 17:57:01.000000000 +0000
@@ -1,3 +1,11 @@
+debhelper (9.20160115ubuntu3) xenial; urgency=medium
+
+  * Backport upstream commit 9ca73a0a ("Pass -a to grep to handle
+    substvars with unicode content gracefully") to fix build-failure
+    with php-mf2 (LP: #1564492, Closes #815620).
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Thu, 31 Mar 2016 08:33:23 -0700
+
 debhelper (9.20160115ubuntu2) xenial; urgency=medium
 
   * dh-strip: Adjust reversion of commit f1a803456 to account for the recent
diff -Nru debhelper-9.20160115ubuntu2/Debian/Debhelper/Dh_Lib.pm debhelper-9.20160115ubuntu3/Debian/Debhelper/Dh_Lib.pm
--- debhelper-9.20160115ubuntu2/Debian/Debhelper/Dh_Lib.pm	2016-01-10 10:47:03.000000000 +0000
+++ debhelper-9.20160115ubuntu3/Debian/Debhelper/Dh_Lib.pm	2016-03-31 17:57:01.000000000 +0000
@@ -703,7 +703,7 @@
 	my $substvarfile="debian/${ext}substvars";
 
 	if (-e $substvarfile) {
-		complex_doit("grep -s -v '^${substvar}=' $substvarfile > $substvarfile.new || true");
+		complex_doit("grep -a -s -v '^${substvar}=' $substvarfile > $substvarfile.new || true");
 		doit("mv", "$substvarfile.new","$substvarfile");
 	}
 }
@@ -750,7 +750,7 @@
 	}
 
 	if (length $line) {
-		 complex_doit("(grep -s -v ${substvar} $substvarfile; echo ".escape_shell("${substvar}=$line").") > $substvarfile.new");
+		 complex_doit("(grep -a -s -v ${substvar} $substvarfile; echo ".escape_shell("${substvar}=$line").") > $substvarfile.new");
 		 doit("mv", "$substvarfile.new", $substvarfile);
 	}
 	else {