diff -Nru pd-libdir-1.11/debian/changelog pd-libdir-1.11/debian/changelog
--- pd-libdir-1.11/debian/changelog	2018-02-01 22:18:32.000000000 +0000
+++ pd-libdir-1.11/debian/changelog	2018-02-05 13:40:17.000000000 +0000
@@ -1,3 +1,10 @@
+pd-libdir (1.11-4) unstable; urgency=medium
+
+  * Switched to system-provided Makefile.pdlibbuilder
+    * Pass build-flags to all 'make' invocations
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Mon, 05 Feb 2018 14:40:17 +0100
+
 pd-libdir (1.11-3) unstable; urgency=medium
 
   * Simplified & unified d/rules
diff -Nru pd-libdir-1.11/debian/control pd-libdir-1.11/debian/control
--- pd-libdir-1.11/debian/control	2018-02-01 22:18:32.000000000 +0000
+++ pd-libdir-1.11/debian/control	2018-02-05 13:40:17.000000000 +0000
@@ -8,6 +8,7 @@
 Build-Depends:
  debhelper (>=11~),
  puredata-dev | puredata (<< 0.43),
+ pd-lib-builder,
 Standards-Version: 4.1.3
 Homepage: https://puredata.info
 Vcs-Git: https://salsa.debian.org/multimedia-team/pd/pd-libdir.git
diff -Nru pd-libdir-1.11/debian/rules pd-libdir-1.11/debian/rules
--- pd-libdir-1.11/debian/rules	2018-02-01 22:18:32.000000000 +0000
+++ pd-libdir-1.11/debian/rules	2018-02-05 13:40:17.000000000 +0000
@@ -10,22 +10,27 @@
 %:
 	dh $@
 
-override_dh_auto_build:
-	dh_auto_build -- \
-		arch.flags="" \
-		CPPFLAGS="$(CPPFLAGS)" \
-		CFLAGS="$(CFLAGS)" \
-		LDFLAGS="$(LDFLAGS) -Wl,-as-needed" \
-		$(empty)
-
 override_dh_auto_install:
-	dh_auto_install -- prefix=/usr pkglibdir=$(pkglibdir)
+	dh_install
 # fix permissions
 	find $(CURDIR)/debian/*/$(pkglibdir) -name "*.pd_linux" -exec \
 		chmod 0664 {} +
 # remove license file so we can replace it with link to the Debian license file
 	rm -f -- $(CURDIR)/debian/*/$(pkglibdir)/*/LICENSE.txt
 
+override_dh_auto_clean \
+override_dh_auto_build \
+override_dh_auto_test \
+override_dh_auto_install:
+	$(patsubst override_%,%,$@) -- \
+		PDLIBBUILDER_DIR=/usr/share/pd-lib-builder/ \
+		prefix=/usr pkglibdir=$(pkglibdir) \
+		arch.flags="" \
+		CPPFLAGS="$(CPPFLAGS)" \
+		CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		$(empty)
+
 licensecheck:
 	licensecheck --deb-machine -r . \
 		> debian/copyright_newhints