diff -Nru devscripts-2.17.12/debian/changelog devscripts-2.17.12ubuntu1/debian/changelog
--- devscripts-2.17.12/debian/changelog	2017-12-30 22:44:18.000000000 +0000
+++ devscripts-2.17.12ubuntu1/debian/changelog	2018-01-03 05:03:46.000000000 +0000
@@ -1,3 +1,10 @@
+devscripts (2.17.12ubuntu1) bionic; urgency=medium
+
+  * test/test_debchange: Explicitly set --vendor Debian, to fix test suite
+    compatibility with Ubuntu.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 02 Jan 2018 21:03:46 -0800
+
 devscripts (2.17.12) unstable; urgency=medium
 
   [ Adam D. Barratt ]
diff -Nru devscripts-2.17.12/debian/control devscripts-2.17.12ubuntu1/debian/control
--- devscripts-2.17.12/debian/control	2017-12-30 21:15:06.000000000 +0000
+++ devscripts-2.17.12ubuntu1/debian/control	2018-01-03 05:03:46.000000000 +0000
@@ -1,7 +1,8 @@
 Source: devscripts
 Section: devel
 Priority: optional
-Maintainer: Devscripts Devel Team <devscripts-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Devscripts Devel Team <devscripts-devel@lists.alioth.debian.org>
 Uploaders:
  Mattia Rizzolo <mattia@debian.org>,
 Build-Depends: bash-completion,
diff -Nru devscripts-2.17.12/test/test_debchange devscripts-2.17.12ubuntu1/test/test_debchange
--- devscripts-2.17.12/test/test_debchange	2017-11-11 23:13:54.000000000 +0000
+++ devscripts-2.17.12ubuntu1/test/test_debchange	2018-01-03 05:03:46.000000000 +0000
@@ -205,9 +205,10 @@
     # $2 → action
     # $3 → expected suite after the action
     rm -f "$CHANGELOG"
-    success "--create -D $1 --package test-package -v 1.0-1 'First upload'"
-    success "$2 'Second Upload'"
-    success "-r ''"
+    vdeb="--vendor Debian"
+    success "$vdeb --create -D $1 --package test-package -v 1.0-1 'First upload'"
+    success "$vdeb $2 'Second Upload'"
+    success "$vdeb -r ''"
     local dist="$(dpkg-parsechangelog -l"$CHANGELOG" -SDistribution)"
     assertEquals "$3" "$dist"
 }