--- /dev/fd/5   2017-01-28 21:12:36.715850671 +0000
+++ -   2017-01-28 21:12:36.719619323 +0000
@@ -288,7 +288,16 @@
 +#DEBHELPER#
 --- bitlbee-3.5.orig/debian/changelog
 +++ bitlbee-3.5/debian/changelog
-@@ -0,0 +1,709 @@
+@@ -0,0 +1,718 @@
++bitlbee (3.5-2) unstable; urgency=medium
++
++  * And then the buildd's got more pedantic on whether debian/rules build*
++    works as non-root (which indeed it should). Turns out the fix from
++    3.4.2-1.1 was wrong, build-* should just call into build. binary-* is
++    the *next* step (and the first one to be done as (fake) root).
++
++ -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 28 Jan 2017 21:06:27 +0000
++
 +bitlbee (3.5-1.1) unstable; urgency=medium
 +
 +  [ dequis ]
@@ -1201,7 +1210,7 @@
 + 
 --- bitlbee-3.5.orig/debian/rules
 +++ bitlbee-3.5/debian/rules
-@@ -0,0 +1,148 @@
+@@ -0,0 +1,150 @@
 +#!/usr/bin/make -f
 +#
 +# Finally switching to debhelper.
@@ -1244,9 +1253,11 @@
 +CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 +
 +HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed")
-+# https://bugs.debian.org/821967
-+build-indep: binary-indep
-+build-arch: binary-arch
++
++# No difference at the build stage so just call main build target. 
++# (Well indep could be docs-only but we prebuild them plus it's really
++# not that much work.)
++build-arch build-indep: build
 +
 +build: build-stamp
 +build-stamp: