diff -Nru glabels-3.4.0/debian/changelog glabels-3.4.0/debian/changelog
--- glabels-3.4.0/debian/changelog	2016-08-07 18:57:07.000000000 +0000
+++ glabels-3.4.0/debian/changelog	2017-02-11 19:39:49.000000000 +0000
@@ -1,3 +1,19 @@
+glabels (3.4.0-1ubuntu0~ppa1) xenial; urgency=medium
+
+  * Backport to Xenial.
+
+ -- Dominik Stadler (Ubuntu key) <dominik.stadler@gmx.at>  Sat, 11 Feb 2017 20:39:31 +0100
+
+glabels (3.4.0-1) unstable; urgency=medium
+
+  * New upstream version
+  * Drop now unneeded hardening-no-fortify-functions override
+  * Convert ldconfig call in postrm to trigger
+  * Bump Standards-Version (no changes needed)
+  * New patch: glabels/debian/patches/gnome-common-cleanup (Closes: #830033)
+
+ -- Jakob Haufe <sur5r@sur5r.net>  Thu, 29 Dec 2016 21:30:59 +0100
+
 glabels (3.4.0-0ubuntu0~ppa1) xenial; urgency=medium
 
   * New upstream release.
@@ -13,10 +29,6 @@
 
 glabels (3.2.1-2build1) xenial; urgency=medium
 
-  * No change rebuild for the new e-d-s sonames
-
- -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 29 Oct 2015 10:51:43 +0100
-
 glabels (3.2.1-2) unstable; urgency=medium
 
   * Call ldconfig in postrm to make lintian happy
diff -Nru glabels-3.4.0/debian/control glabels-3.4.0/debian/control
--- glabels-3.4.0/debian/control	2016-08-07 18:56:26.000000000 +0000
+++ glabels-3.4.0/debian/control	2017-02-11 19:38:45.000000000 +0000
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Jakob Haufe <sur5r@sur5r.net>
 Build-Depends: autotools-dev,
+               autoconf-archive,
                cdbs,
                dpkg-dev (>= 1.16.1~),
                debhelper (>= 9.0),
@@ -20,7 +21,7 @@
                barcode (>= 0.98),
                libqrencode-dev (>= 3.1.0),
                libiec16022-dev (>= 0.2.4)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://glabels.org/
 
 Package: glabels
diff -Nru glabels-3.4.0/debian/glabels.lintian-overrides glabels-3.4.0/debian/glabels.lintian-overrides
--- glabels-3.4.0/debian/glabels.lintian-overrides	2014-01-07 08:04:06.000000000 +0000
+++ glabels-3.4.0/debian/glabels.lintian-overrides	2017-02-11 19:38:32.000000000 +0000
@@ -1,6 +1,4 @@
 # We have no external users of those libraries yet
 glabels: package-name-doesnt-match-sonames libglabels-3.0-8 libglbarcode-3.0-0
-# All hardening flags are present, unsolvable ATM
-glabels: hardening-no-fortify-functions usr/bin/glabels-3
 # No reasonable keywords to be added here
 glabels: desktop-entry-lacks-keywords-entry usr/share/applications/glabels-3.0.desktop
diff -Nru glabels-3.4.0/debian/glabels.postrm glabels-3.4.0/debian/glabels.postrm
--- glabels-3.4.0/debian/glabels.postrm	2016-01-23 12:46:01.000000000 +0000
+++ glabels-3.4.0/debian/glabels.postrm	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = "remove" ]; then
-    ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff -Nru glabels-3.4.0/debian/glabels.triggers glabels-3.4.0/debian/glabels.triggers
--- glabels-3.4.0/debian/glabels.triggers	1970-01-01 00:00:00.000000000 +0000
+++ glabels-3.4.0/debian/glabels.triggers	2017-02-11 19:38:32.000000000 +0000
@@ -0,0 +1 @@
+activate-noawait ldconfig
diff -Nru glabels-3.4.0/debian/patches/gnome-common-cleanup glabels-3.4.0/debian/patches/gnome-common-cleanup
--- glabels-3.4.0/debian/patches/gnome-common-cleanup	1970-01-01 00:00:00.000000000 +0000
+++ glabels-3.4.0/debian/patches/gnome-common-cleanup	2017-02-11 19:38:32.000000000 +0000
@@ -0,0 +1,19 @@
+Description: Replace deprecated gnome-common macro
+ GNOME_COMPILER_WARNINGS has been deprecated. Replace it by call to
+ AX_COMPILER_FLAGS.
+Author: Jakob Haufe <sur5r@sur5r.net>
+Bug-Debian: https://bugs.debian.org/830033
+Forwarded: https://github.com/jimevins/glabels/pull/18
+Last-Update: 2016-12-15
+
+--- glabels-3.4.0.orig/configure.ac
++++ glabels-3.4.0/configure.ac
+@@ -43,7 +43,7 @@ AC_SEARCH_LIBS([strerror],[cposix])
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ 
+-GNOME_COMPILE_WARNINGS
++AX_COMPILER_FLAGS
+ 
+ AC_PATH_PROG(GLIB_GENMARSHAL,         glib-genmarshal)
+ AC_PATH_PROG(GDK_PIXBUF_CSOURCE,      gdk-pixbuf-csource)
diff -Nru glabels-3.4.0/debian/patches/series glabels-3.4.0/debian/patches/series
--- glabels-3.4.0/debian/patches/series	2016-08-07 18:53:24.000000000 +0000
+++ glabels-3.4.0/debian/patches/series	2017-02-11 19:38:57.000000000 +0000
@@ -1,4 +1,5 @@
 0002-manpage.patch
 0003-Ignore-license.page.patch
+gnome-common-cleanup
 # applied upstream: 0004-unbreak-with-evolution-data-server-3.6.0.patch
 # file is gone: 0005-fix-pl.po-encoding.diff