diff -u freetype-2.8.1/debian/changelog freetype-2.8.1/debian/changelog
--- freetype-2.8.1/debian/changelog
+++ freetype-2.8.1/debian/changelog
@@ -1,3 +1,19 @@
+freetype (2.8.1-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control:
+    - Mark libfreetype6-dev Multi-Arch: same
+      (Closes: #642354, #666761, #870618).
+    - Remove the deprecated Priority: extra marking from libfreetype6-udeb.
+  * debian/rules:
+    - Include /usr/share/dpkg/architecture.mk.
+    - Replace the autoconf definition of SIZEOF_LONG with the
+      compile-time constant __SIZEOF_LONG__.
+    - Exclude freetype-config, freetype-config.1 and freetype2.m4
+      from installation in libfreetype6-dev.
+
+ -- Hugh McMaster <hugh.mcmaster@outlook.com>  Sun, 17 Dec 2017 22:38:43 +1100
+
 freetype (2.8.1-0.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u freetype-2.8.1/debian/control freetype-2.8.1/debian/control
--- freetype-2.8.1/debian/control
+++ freetype-2.8.1/debian/control
@@ -49,6 +49,7 @@
 Architecture: any
 Section: libdevel
 Depends: libfreetype6 (= ${binary:Version}), libc6-dev | libc-dev, zlib1g-dev | libz-dev, libpng-dev, ${misc:Depends}
+Multi-Arch: same
 Description: FreeType 2 font engine, development files
  The FreeType project is a team of volunteers who develop free,
  portable and high-quality software solutions for digital typography. 
@@ -71,7 +72,6 @@
 
 Package: libfreetype6-udeb
 XC-Package-Type: udeb
-Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Section: debian-installer
diff -u freetype-2.8.1/debian/libfreetype6-dev.install freetype-2.8.1/debian/libfreetype6-dev.install
--- freetype-2.8.1/debian/libfreetype6-dev.install
+++ freetype-2.8.1/debian/libfreetype6-dev.install
@@ -1,8 +1,5 @@
-usr/bin/freetype-config
 usr/include/
 usr/lib/*/*.so
 usr/lib/*/*.la
 usr/lib/*/*.a
 usr/lib/*/pkgconfig/
-usr/share/aclocal/
-/usr/share/man/man1/freetype-config.1
diff -u freetype-2.8.1/debian/rules freetype-2.8.1/debian/rules
--- freetype-2.8.1/debian/rules
+++ freetype-2.8.1/debian/rules
@@ -3,9 +3,7 @@
 # This is free software; see the GNU General Public Licence
 # version 2 or later for copying conditions.  There is NO warranty.
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+include /usr/share/dpkg/architecture.mk
 
 ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
   export LIBPNG_CFLAGS = -I/usr/include/libpng12
@@ -83,6 +81,7 @@
 	dh_auto_build -D $(ft2demos_u) -- TOP_DIR=../$(freetype_u) \
 		OBJ_DIR=../$(freetype_u)/objs
 endif
+	sed -i '/SIZEOF_LONG/s/[0-9]/__SIZEOF_LONG__/' $(freetype_u)/builds/unix/ftconfig.h
 
 override_dh_auto_clean:
 	rm -f unpack-stamp patch-stamp
@@ -98,7 +97,7 @@
 	sed -i -e'/dependency_libs/s/'.*'//' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libfreetype.la
 
 override_dh_install:
-	dh_install --fail-missing
+	dh_install --fail-missing -Xfreetype-config -Xfreetype2.m4
 
 override_dh_installdocs:
 ifneq (,$(findstring $(libpkg), $(shell dh_listpackages)))
@@ -110,7 +109,7 @@
 	dh_installdocs --link-doc=$(libpkg) -p$(devpkg) \
 		-Xreference/README -Xreference/.gitignore \
 		-XLICENSE.TXT -XGPL.TXT -XGPLv2.TXT -XBUILD -XINSTALL \
-		$(addprefix -X,$(libdoc)) \
+		-Xfreetype-config.1 $(addprefix -X,$(libdoc)) \
 		$(ftdocs_d)/docs/*
 endif
 	dh_installdocs -N$(devpkg) -N$(libpkg) --link-doc=$(libpkg)