diff -Nru wbar-2.3.4/debian/changelog wbar-2.3.4/debian/changelog
--- wbar-2.3.4/debian/changelog	2018-07-27 15:37:11.000000000 +0000
+++ wbar-2.3.4/debian/changelog	2018-12-07 17:50:04.000000000 +0000
@@ -1,3 +1,15 @@
+wbar (2.3.4-9) unstable; urgency=medium
+
+  [ Andreas Henriksson ]
+  * Fix pidof path reproducibility issue on merged-usr vs non-merged systems.
+    (Closes: #915798)
+
+  [ Markus Koschany ]
+  * Declare compliance with Debian Policy 4.2.1.
+  * Remove get-orig-source target.
+
+ -- Markus Koschany <apo@debian.org>  Fri, 07 Dec 2018 18:50:04 +0100
+
 wbar (2.3.4-8) unstable; urgency=medium
 
   * Switch to compat level 11.
diff -Nru wbar-2.3.4/debian/control wbar-2.3.4/debian/control
--- wbar-2.3.4/debian/control	2018-07-27 15:37:11.000000000 +0000
+++ wbar-2.3.4/debian/control	2018-12-07 17:50:04.000000000 +0000
@@ -11,7 +11,7 @@
  libimlib2-dev,
  libx11-dev,
  pkg-config
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
 Homepage: https://github.com/rodolf0/wbar
 Vcs-Git: https://salsa.debian.org/debian/wbar.git
 Vcs-Browser: https://salsa.debian.org/debian/wbar
diff -Nru wbar-2.3.4/debian/patches/no-AC_SUBST-pidof.patch wbar-2.3.4/debian/patches/no-AC_SUBST-pidof.patch
--- wbar-2.3.4/debian/patches/no-AC_SUBST-pidof.patch	1970-01-01 00:00:00.000000000 +0000
+++ wbar-2.3.4/debian/patches/no-AC_SUBST-pidof.patch	2018-12-07 17:50:04.000000000 +0000
@@ -0,0 +1,15 @@
+From: Andreas Henriksson <andreas@fatal.se>
+Subject: Don't shadow the PIDOF_BIN variable for AC_PATH_PIDOF in AC_SUBST
+
+AC_PATH_PROG documents that the way to override it is to specify the variable. This doesn't work if the same variable is AC_SUBST before that.
+
+--- wbar-2.3.4.orig/configure.ac
++++ wbar-2.3.4/configure.ac
+@@ -77,7 +77,6 @@ fi
+ 
+ AM_CONDITIONAL([WBAR_CONFIG],[test "$use_wbar_config" = "yes"])
+ 
+-AC_SUBST(PIDOF_BIN, "pidof ")
+ AC_PATH_PROG(PIDOF_BIN, pidof, pgrep)
+ AC_DEFINE_UNQUOTED(PIDOF_BIN, "$PIDOF_BIN ", [ program to retreive wbar pid ])
+ 
diff -Nru wbar-2.3.4/debian/patches/series wbar-2.3.4/debian/patches/series
--- wbar-2.3.4/debian/patches/series	2018-07-27 15:37:11.000000000 +0000
+++ wbar-2.3.4/debian/patches/series	2018-12-07 17:50:04.000000000 +0000
@@ -1,3 +1,5 @@
 01_change_initial_wbar_config
 gcc-6-literal-suffix.patch
 remove-GNOME2_DIR.patch
+no-AC_SUBST-pidof.patch
+
diff -Nru wbar-2.3.4/debian/rules wbar-2.3.4/debian/rules
--- wbar-2.3.4/debian/rules	2018-07-27 15:37:11.000000000 +0000
+++ wbar-2.3.4/debian/rules	2018-12-07 17:50:04.000000000 +0000
@@ -7,5 +7,7 @@
 %:
 	dh $@ --with bash-completion
 
-get-orig-source:
-	uscan --verbose --download-current-version --force-download
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		PIDOF_BIN=/bin/pidof
+