diff -Nru hmat-oss-1.2.0/debian/changelog hmat-oss-1.2.0/debian/changelog
--- hmat-oss-1.2.0/debian/changelog	2016-10-20 08:04:49.000000000 +0000
+++ hmat-oss-1.2.0/debian/changelog	2016-10-22 07:55:39.000000000 +0000
@@ -1,3 +1,18 @@
+hmat-oss (1.2.0-2ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Conflict/Replace/Provide renamed library package.  This change can
+      be dropped after the 18.04 release.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 22 Oct 2016 00:54:39 -0700
+
+hmat-oss (1.2.0-2) unstable; urgency=medium
+
+  * New patch: 0002-Fix-compilation-on-Linux-32-bits-systems.patch
+    Fix compilation on 32bit systems, thanks Jérôme Robert.
+
+ -- Denis Barbier <barbier@debian.org>  Thu, 20 Oct 2016 21:08:08 +0100
+
 hmat-oss (1.2.0-1ubuntu1) zesty; urgency=low
 
   * Sync from Debian unstable.
diff -Nru hmat-oss-1.2.0/debian/patches/0002-Fix-compilation-on-Linux-32-bits-systems.patch hmat-oss-1.2.0/debian/patches/0002-Fix-compilation-on-Linux-32-bits-systems.patch
--- hmat-oss-1.2.0/debian/patches/0002-Fix-compilation-on-Linux-32-bits-systems.patch	1970-01-01 00:00:00.000000000 +0000
+++ hmat-oss-1.2.0/debian/patches/0002-Fix-compilation-on-Linux-32-bits-systems.patch	2016-10-20 20:07:21.000000000 +0000
@@ -0,0 +1,21 @@
+From: Jerome Robert <jeromerobert@gmx.com>
+Date: Thu, 20 Oct 2016 07:04:55 +0200
+Subject: Fix compilation on Linux 32 bits systems
+
+---
+ src/common/memory_instrumentation.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/memory_instrumentation.cpp b/src/common/memory_instrumentation.cpp
+index 22acd3d..93edfb2 100644
+--- a/src/common/memory_instrumentation.cpp
++++ b/src/common/memory_instrumentation.cpp
+@@ -46,7 +46,7 @@ static size_t get_res_mem(void *)
+     size_t resident = 0;
+ #ifdef __linux__
+     FILE * statm_file = fopen("/proc/self/statm", "r");
+-    fscanf(statm_file, "%*s %lu", &resident);
++    fscanf(statm_file, "%*s %zu", &resident);
+     fclose(statm_file);
+ #endif
+     return resident * 4096;
diff -Nru hmat-oss-1.2.0/debian/patches/series hmat-oss-1.2.0/debian/patches/series
--- hmat-oss-1.2.0/debian/patches/series	2016-10-19 20:20:33.000000000 +0000
+++ hmat-oss-1.2.0/debian/patches/series	2016-10-20 20:07:21.000000000 +0000
@@ -1 +1,2 @@
 0001-make-build-reproducible.patch
+0002-Fix-compilation-on-Linux-32-bits-systems.patch