diff -u unixodbc-2.3.4/configure.ac unixodbc-2.3.4/configure.ac
--- unixodbc-2.3.4/configure.ac
+++ unixodbc-2.3.4/configure.ac
@@ -291,7 +291,7 @@
 fi
 
 AC_CHECK_LONG_LONG
-AC_CHECK_SIZEOF([long int])
+AC_DEFINE([SIZEOF_LONG_INT],[__SIZEOF_LONG__],[Architecture-independent definition of sizeof(long int)])
 
 AC_CHECK_FUNCS( strcasecmp strncasecmp vsnprintf strtol atoll strtoll endpwent gettimeofday ftime time stricmp strnicmp getuid getpwuid nl_langinfo )
 
diff -u unixodbc-2.3.4/debian/changelog unixodbc-2.3.4/debian/changelog
--- unixodbc-2.3.4/debian/changelog
+++ unixodbc-2.3.4/debian/changelog
@@ -1,3 +1,14 @@
+unixodbc (2.3.4-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use an architecture-independent definition of sizeof(long int)
+    to avoid a file conflict on multi-arch installations.
+  * debian/control:
+    - Mark unixodbc-dev Multi-Arch: same (Closes: #872411).
+    - Remove Priority: extra from unixodbc-dev.
+
+ -- Hugh McMaster <hugh.mcmaster@outlook.com>  Sun, 29 Oct 2017 20:29:55 +1100
+
 unixodbc (2.3.4-1) unstable; urgency=medium
 
   * New upstream release.  Closes: #843847.
diff -u unixodbc-2.3.4/debian/control unixodbc-2.3.4/debian/control
--- unixodbc-2.3.4/debian/control
+++ unixodbc-2.3.4/debian/control
@@ -44,11 +44,12 @@
 
 Package: unixodbc-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
-Priority: extra
 Depends: libodbc1 (= ${binary:Version}),
 	odbcinst1debian2 (= ${binary:Version}),
 	libltdl3-dev, ${misc:Depends}
+Replaces: unixodbc-dev (<= 2.3.4-1)
 Conflicts: libiodbc2-dev, remembrance-agent (<< 2.11-4)
 Description: ODBC libraries for UNIX (development files)
  This package contains the development files (headers and libraries) for