diff -Nru freehdl-0.0.8/debian/changelog freehdl-0.0.8/debian/changelog
--- freehdl-0.0.8/debian/changelog	2015-08-03 19:34:36.000000000 -0500
+++ freehdl-0.0.8/debian/changelog	2016-12-07 22:16:55.000000000 -0600
@@ -1,3 +1,19 @@
+freehdl (0.0.8-2.2ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - Manual changes to debian/rules for the ABI change.
+    - Rename library packages for g++5 ABI transition. 
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 07 Dec 2016 22:16:55 -0600
+
+freehdl (0.0.8-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with GCC6 by using -std=gnu++98 (Closes: #811804).
+  * Fix the dependency on the libtool binary (Closes: #836414).
+
+ -- Andrey Rahmatullin <wrar@debian.org>  Sat, 03 Dec 2016 03:02:27 +0500
+
 freehdl (0.0.8-2.1ubuntu2) wily; urgency=medium
 
   * Manual changes to debian/rules for the ABI change.
diff -Nru freehdl-0.0.8/debian/control freehdl-0.0.8/debian/control
--- freehdl-0.0.8/debian/control	2015-08-03 18:28:49.000000000 -0500
+++ freehdl-0.0.8/debian/control	2016-12-07 22:16:04.000000000 -0600
@@ -9,7 +9,7 @@
 
 Package: freehdl
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, g++, libfreehdl0-dev, guile-2.0 | guile, libtool, pkg-config
+Depends: ${shlibs:Depends}, ${misc:Depends}, g++, libfreehdl0-dev, guile-2.0 | guile, libtool-bin, pkg-config
 Description: VHDL simulator for Linux
  This is a free VHDL simulator with these features:
   * Has a graphical waveform viewer.
diff -Nru freehdl-0.0.8/debian/rules freehdl-0.0.8/debian/rules
--- freehdl-0.0.8/debian/rules	2015-08-03 19:34:19.000000000 -0500
+++ freehdl-0.0.8/debian/rules	2016-12-07 22:16:04.000000000 -0600
@@ -5,6 +5,7 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_CXXFLAGS_MAINT_APPEND=-std=gnu++98
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk