diff -Nru dpkg-1.16.18/debian/changelog dpkg-1.16.18+rpi1/debian/changelog
--- dpkg-1.16.18/debian/changelog	2016-03-26 10:25:28.000000000 +0000
+++ dpkg-1.16.18+rpi1/debian/changelog	2016-06-17 23:26:43.000000000 +0000
@@ -1,3 +1,12 @@
+dpkg (1.16.18+rpi1) wheezy-staging; urgency=medium
+
+  [changes brought forward from 1.16.16+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 18 Apr 2015 13:18:17 +0000]
+  * If a vendor perl module for the current vendor can't be found use the
+    "Debian" one not the "Default" one.
+    This should make dpkg-buildflags behave the same on Rasbian as on Debian
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 17 Jun 2016 23:26:42 +0000
+
 dpkg (1.16.18) wheezy; urgency=medium
 
   * Remove trailing space before handling blank line dot-separator in
diff -Nru dpkg-1.16.18/scripts/Dpkg/Vendor.pm dpkg-1.16.18+rpi1/scripts/Dpkg/Vendor.pm
--- dpkg-1.16.18/scripts/Dpkg/Vendor.pm	2016-03-26 10:22:51.000000000 +0000
+++ dpkg-1.16.18+rpi1/scripts/Dpkg/Vendor.pm	2016-06-17 23:26:43.000000000 +0000
@@ -135,7 +135,7 @@
     if ($vendor ne "Default") {
         push @names, $vendor, lc($vendor), ucfirst($vendor), ucfirst(lc($vendor));
     }
-    foreach my $name (@names, "Default") {
+    foreach my $name (@names, "Debian") {
         eval qq{
             require Dpkg::Vendor::$name;
             \$obj = Dpkg::Vendor::$name->new();