diff -Nru devscripts-2.16.1/debian/changelog devscripts-2.16.1+rpi1/debian/changelog
--- devscripts-2.16.1/debian/changelog	2016-02-12 02:07:52.000000000 +0000
+++ devscripts-2.16.1+rpi1/debian/changelog	2016-03-03 16:22:13.000000000 +0000
@@ -1,3 +1,9 @@
+devscripts (2.16.1+rpi1) stretch-staging; urgency=medium
+
+  * Revert change to version number generation in devscripts.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 03 Mar 2016 16:21:47 +0000
+
 devscripts (2.16.1) unstable; urgency=medium
 
   [ Antonio Terceiro ]
diff -Nru devscripts-2.16.1/scripts/uupdate.sh devscripts-2.16.1+rpi1/scripts/uupdate.sh
--- devscripts-2.16.1/scripts/uupdate.sh	2016-02-12 02:07:52.000000000 +0000
+++ devscripts-2.16.1+rpi1/scripts/uupdate.sh	2016-03-03 16:21:18.000000000 +0000
@@ -139,11 +139,12 @@
 SUFFIX="1"
 
 if which dpkg-vendor >/dev/null 2>&1; then
-  VENDER="$(dpkg-vendor --query Vendor 2>/dev/null|tr 'A-Z' 'a-z')"
-  case "$VENDER" in
-  debian) SUFFIX="1" ;;
-  *) SUFFIX="0${VENDER}1" ;;
-  esac
+    case "$(dpkg-vendor --query Vendor 2>/dev/null)" in
+	"Ubuntu")
+	    SUFFIX="0ubuntu1"
+	    ;;
+    esac
+
 else
   SUFFIX="1"
 fi