diff -Nru pugixml-1.8.1/debian/changelog pugixml-1.8.1/debian/changelog
--- pugixml-1.8.1/debian/changelog	2017-08-18 13:37:07.000000000 +0000
+++ pugixml-1.8.1/debian/changelog	2017-11-01 05:18:54.000000000 +0000
@@ -1,3 +1,19 @@
+pugixml (1.8.1-7) unstable; urgency=medium
+
+  * Fix FTCBFS: Closes: #-1, Thanks to Helmut Grohne.
+    + Honour DEB_BUILD_OPTIONS=nocheck.
+    + Always use a multiarch install layout.
+  * Mark package compliance with Debian Policy 4.1.1.
+
+ -- Vasudev Kamath <vasudev@copyninja.info>  Wed, 01 Nov 2017 10:48:54 +0530
+
+pugixml (1.8.1-6) unstable; urgency=medium
+
+  * Drop multi-arch tag for now from libpugixml-dev.
+    Closes: bug#874243. Thanks to Helmut Grohne.
+
+ -- Vasudev Kamath <vasudev@copyninja.info>  Fri, 15 Sep 2017 20:49:03 +0530
+
 pugixml (1.8.1-5) unstable; urgency=medium
 
   * Fix revive symbols seemingly wrongly dropped since 1.7-1.
diff -Nru pugixml-1.8.1/debian/control pugixml-1.8.1/debian/control
--- pugixml-1.8.1/debian/control	2017-08-18 12:30:46.000000000 +0000
+++ pugixml-1.8.1/debian/control	2017-11-01 04:33:13.000000000 +0000
@@ -9,7 +9,7 @@
  pkg-kde-tools
 Maintainer: Vasudev Kamath <vasudev@copyninja.info>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
-Standards-Version: 4.0.1
+Standards-Version: 4.1.1
 Homepage: http://pugixml.org/
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/pugixml.git
 Vcs-Browser: https://anonscm.debian.org/git/collab-maint/pugixml.git
@@ -42,7 +42,6 @@
 Package: libpugixml-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: same
 Depends: libpugixml1v5 (= ${binary:Version}),
  ${misc:Depends},
  ${devlibs:Depends}
diff -Nru pugixml-1.8.1/debian/control.in pugixml-1.8.1/debian/control.in
--- pugixml-1.8.1/debian/control.in	2017-08-18 13:37:07.000000000 +0000
+++ pugixml-1.8.1/debian/control.in	2017-11-01 05:18:54.000000000 +0000
@@ -4,7 +4,7 @@
 Build-Depends: @cdbs@
 Maintainer: Vasudev Kamath <vasudev@copyninja.info>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
-Standards-Version: 4.0.1
+Standards-Version: 4.1.1
 Homepage: http://pugixml.org/
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/pugixml.git
 Vcs-Browser: https://anonscm.debian.org/git/collab-maint/pugixml.git
@@ -37,7 +37,6 @@
 Package: libpugixml-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: same
 Depends: libpugixml1v5 (= ${binary:Version}),
  ${misc:Depends},
  ${devlibs:Depends}
diff -Nru pugixml-1.8.1/debian/control.in.in pugixml-1.8.1/debian/control.in.in
--- pugixml-1.8.1/debian/control.in.in	2017-08-18 12:28:16.000000000 +0000
+++ pugixml-1.8.1/debian/control.in.in	2017-11-01 04:22:04.000000000 +0000
@@ -4,7 +4,7 @@
 Build-Depends: @cdbs@
 Maintainer: Vasudev Kamath <vasudev@copyninja.info>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
-Standards-Version: 4.0.1
+Standards-Version: 4.1.1
 Homepage: http://pugixml.org/
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/pugixml.git
 Vcs-Browser: https://anonscm.debian.org/git/collab-maint/pugixml.git
@@ -37,7 +37,6 @@
 Package: libpugixml-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: same
 Depends: __PKG-LIB__ (= ${binary:Version}),
  ${misc:Depends},
  ${devlibs:Depends}
diff -Nru pugixml-1.8.1/debian/rules pugixml-1.8.1/debian/rules
--- pugixml-1.8.1/debian/rules	2017-08-18 12:30:46.000000000 +0000
+++ pugixml-1.8.1/debian/rules	2017-11-01 04:11:22.000000000 +0000
@@ -31,6 +31,7 @@
 		<debian/control.in.in \
 		>debian/control.in
 
+include /usr/share/dpkg/architecture.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
@@ -45,7 +46,10 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=$(if $(EXP_RELEASE),0,1)
 
 # Build the shared library
-DEB_CMAKE_EXTRA_FLAGS += -DBUILD_TESTS=1 -DBUILD_PKGCONFIG=1
+DEB_CMAKE_EXTRA_FLAGS += -DBUILD_PKGCONFIG=1 -DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH)
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+DEB_CMAKE_EXTRA_FLAGS += -DBUILD_TESTS=1
+endif
 
 # We need this to build the package
 CDBS_BUILD_DEPENDS +=, cmake