diff -Nru hardening-wrapper-2.7/debian/changelog hardening-wrapper-2.8+nmu1/debian/changelog
--- hardening-wrapper-2.7/debian/changelog	2014-11-15 02:27:19.000000000 +0800
+++ hardening-wrapper-2.8+nmu1/debian/changelog	2015-12-07 11:07:19.000000000 +0800
@@ -1,3 +1,12 @@
+hardening-wrapper (2.8+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload: as binutils breaks <<2.8, so bump version.
+  * Also wrapper gcc-5. (Closes: #801597)
+  * Wrapper DEB_BUILD_MULTIARCH-ld.{bfd,gold}, instead of ld.{bfd,gold}.
+    (Closes: #802579)
+
+ -- YunQiang Su <syq@debian.org>  Mon, 07 Dec 2015 10:57:54 +0800
+
 hardening-wrapper (2.7) unstable; urgency=medium
 
   * hardening.make: drop mips restriction on building PIE.
diff -Nru hardening-wrapper-2.7/debian/hardening-wrapper.links hardening-wrapper-2.8+nmu1/debian/hardening-wrapper.links
--- hardening-wrapper-2.7/debian/hardening-wrapper.links	2013-09-14 03:55:36.000000000 +0800
+++ hardening-wrapper-2.8+nmu1/debian/hardening-wrapper.links	2015-12-07 11:33:14.000000000 +0800
@@ -1,12 +1,13 @@
 #!/bin/sh
 # programatically build links (change debian/h-w.{preinst,postrm} too)
-for ver in 4.2 4.3 4.4 4.5 4.6 4.7 4.8 4.9
+eval $(dpkg-architecture -a)
+for ver in 4.2 4.3 4.4 4.5 4.6 4.7 4.8 4.9 5
 do
     echo usr/bin/hardened-cc usr/bin/gcc-$ver
     echo usr/bin/hardened-c++ usr/bin/g++-$ver
 done
 cat <<EOM
-usr/bin/hardened-ld usr/bin/ld.bfd
-usr/bin/hardened-ld usr/bin/ld.gold
+usr/bin/hardened-ld usr/bin/${DEB_BUILD_MULTIARCH}-ld.bfd
+usr/bin/hardened-ld usr/bin/${DEB_BUILD_MULTIARCH}-ld.gold
 usr/share/man/man1/hardened-cc.1 usr/share/man/man1/hardening-wrapper.1
 EOM
diff -Nru hardening-wrapper-2.7/debian/hardening-wrapper.postinst hardening-wrapper-2.8+nmu1/debian/hardening-wrapper.postinst
--- hardening-wrapper-2.7/debian/hardening-wrapper.postinst	2011-07-04 04:13:18.000000000 +0800
+++ hardening-wrapper-2.8+nmu1/debian/hardening-wrapper.postinst	2015-12-07 11:09:41.000000000 +0800
@@ -29,4 +29,9 @@
 	undiv g++-4.1
 fi
 
+if [ "$1" = "configure" ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt "2.8"; then
+	undiv ld.bfd
+	undiv ld.gold
+fi
+
 #DEBHELPER#
diff -Nru hardening-wrapper-2.7/debian/hardening-wrapper.postrm hardening-wrapper-2.8+nmu1/debian/hardening-wrapper.postrm
--- hardening-wrapper-2.7/debian/hardening-wrapper.postrm	2013-09-14 03:55:52.000000000 +0800
+++ hardening-wrapper-2.8+nmu1/debian/hardening-wrapper.postrm	2015-12-07 10:48:44.000000000 +0800
@@ -6,17 +6,19 @@
 		--rename --remove /usr/bin/"$1" || true
 }
 
+eval $(dpkg-architecture -a)
+
 if [ "$1" = "remove" ] || [ "$1" = "abort-install" ]; then
 	# handle diversions (change debian/h-w.links, debian/h-w.preinst too)
-	for ver in 4.2 4.3 4.4 4.5 4.6 4.7 4.8 4.9
+	for ver in 4.2 4.3 4.4 4.5 4.6 4.7 4.8 4.9 5
 	do
 		for i in gcc g++
 		do
 			undiv "$i-$ver"
 		done
 	done
-	undiv ld.bfd
-	undiv ld.gold
+	undiv ${DEB_BUILD_MULTIARCH}-ld.bfd
+	undiv ${DEB_BUILD_MULTIARCH}-ld.gold
 fi
 
 #DEBHELPER#
diff -Nru hardening-wrapper-2.7/debian/hardening-wrapper.preinst hardening-wrapper-2.8+nmu1/debian/hardening-wrapper.preinst
--- hardening-wrapper-2.7/debian/hardening-wrapper.preinst	2013-09-14 03:55:45.000000000 +0800
+++ hardening-wrapper-2.8+nmu1/debian/hardening-wrapper.preinst	2015-12-07 11:02:49.000000000 +0800
@@ -6,17 +6,19 @@
 		--divert /usr/bin/"$1".real /usr/bin/"$1"
 }
 
+eval $(dpkg-architecture -a)
+
 if [ "install" = "$1" ] || [ "upgrade" = "$1" ]; then
 	# handle diversions (change debian/h-w.links, debian/h-w.postrm too)
-	for ver in 4.2 4.3 4.4 4.5 4.6 4.7 4.8 4.9
+	for ver in 4.2 4.3 4.4 4.5 4.6 4.7 4.8 4.9 5
 	do
 		for i in gcc g++
 		do
 			dodiv "$i-$ver"
 		done
 	done
-	dodiv ld.bfd
-	dodiv ld.gold
+	dodiv ${DEB_BUILD_MULTIARCH}-ld.bfd
+	dodiv ${DEB_BUILD_MULTIARCH}-ld.gold
 fi
 
 #DEBHELPER#