diff -Nru dpkg-1.18.23ubuntu1/debian/changelog dpkg-1.18.23ubuntu2/debian/changelog
--- dpkg-1.18.23ubuntu1/debian/changelog	2017-04-19 16:28:59.000000000 +0000
+++ dpkg-1.18.23ubuntu2/debian/changelog	2017-04-21 01:43:01.000000000 +0000
@@ -1,3 +1,9 @@
+dpkg (1.18.23ubuntu2) artful; urgency=medium
+
+  * dpkg-genchanges: Don't add buildinfo files to the changes file.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 20 Apr 2017 19:43:01 -0600
+
 dpkg (1.18.23ubuntu1) artful; urgency=medium
 
   * Merge from Debian (LP: #1654905, #1652945); remaining Ubuntu changes:
diff -Nru dpkg-1.18.23ubuntu1/scripts/dpkg-genchanges.pl dpkg-1.18.23ubuntu2/scripts/dpkg-genchanges.pl
--- dpkg-1.18.23ubuntu1/scripts/dpkg-genchanges.pl	2017-02-22 21:50:39.000000000 +0000
+++ dpkg-1.18.23ubuntu2/scripts/dpkg-genchanges.pl	2017-04-21 01:42:39.000000000 +0000
@@ -311,8 +311,6 @@
     my $f = $file->{filename};
 
     if (defined $file->{package} && $file->{package_type} eq 'buildinfo') {
-        # We always distribute the .buildinfo file.
-        $checksums->add_from_file("$uploadfilesdir/$f", key => $f);
         next;
     }
 
diff -Nru dpkg-1.18.23ubuntu1/scripts/t/dpkg_buildpackage/test-source_0_all.changes dpkg-1.18.23ubuntu2/scripts/t/dpkg_buildpackage/test-source_0_all.changes
--- dpkg-1.18.23ubuntu1/scripts/t/dpkg_buildpackage/test-source_0_all.changes	2017-02-22 21:50:39.000000000 +0000
+++ dpkg-1.18.23ubuntu2/scripts/t/dpkg_buildpackage/test-source_0_all.changes	2017-04-21 01:42:39.000000000 +0000
@@ -18,10 +18,7 @@
    * Entry. Closes: #12345
 Checksums-Sha1:
  0000000000000000000000000000000000000000 0 test-binary-all_0_all.deb
- 0000000000000000000000000000000000000000 0 test-source_0_all.buildinfo
 Checksums-Sha256:
  0000000000000000000000000000000000000000000000000000000000000000 0 test-binary-all_0_all.deb
- 0000000000000000000000000000000000000000000000000000000000000000 0 test-source_0_all.buildinfo
 Files:
  00000000000000000000000000000000 0 test optional test-binary-all_0_all.deb
- 00000000000000000000000000000000 0 test optional test-source_0_all.buildinfo
diff -Nru dpkg-1.18.23ubuntu1/scripts/t/dpkg_buildpackage/test-source_0_any.changes dpkg-1.18.23ubuntu2/scripts/t/dpkg_buildpackage/test-source_0_any.changes
--- dpkg-1.18.23ubuntu1/scripts/t/dpkg_buildpackage/test-source_0_any.changes	2017-02-22 21:50:39.000000000 +0000
+++ dpkg-1.18.23ubuntu2/scripts/t/dpkg_buildpackage/test-source_0_any.changes	2017-04-21 01:42:39.000000000 +0000
@@ -18,10 +18,7 @@
    * Entry. Closes: #12345
 Checksums-Sha1:
  0000000000000000000000000000000000000000 0 test-binary-any_0_amd64.deb
- 0000000000000000000000000000000000000000 0 test-source_0_amd64.buildinfo
 Checksums-Sha256:
  0000000000000000000000000000000000000000000000000000000000000000 0 test-binary-any_0_amd64.deb
- 0000000000000000000000000000000000000000000000000000000000000000 0 test-source_0_amd64.buildinfo
 Files:
  00000000000000000000000000000000 0 test optional test-binary-any_0_amd64.deb
- 00000000000000000000000000000000 0 test optional test-source_0_amd64.buildinfo
diff -Nru dpkg-1.18.23ubuntu1/scripts/t/dpkg_buildpackage/test-source_0_binary.changes dpkg-1.18.23ubuntu2/scripts/t/dpkg_buildpackage/test-source_0_binary.changes
--- dpkg-1.18.23ubuntu1/scripts/t/dpkg_buildpackage/test-source_0_binary.changes	2017-02-22 21:50:39.000000000 +0000
+++ dpkg-1.18.23ubuntu2/scripts/t/dpkg_buildpackage/test-source_0_binary.changes	2017-04-21 01:42:39.000000000 +0000
@@ -19,12 +19,9 @@
 Checksums-Sha1:
  0000000000000000000000000000000000000000 0 test-binary-all_0_all.deb
  0000000000000000000000000000000000000000 0 test-binary-any_0_amd64.deb
- 0000000000000000000000000000000000000000 0 test-source_0_amd64.buildinfo
 Checksums-Sha256:
  0000000000000000000000000000000000000000000000000000000000000000 0 test-binary-all_0_all.deb
  0000000000000000000000000000000000000000000000000000000000000000 0 test-binary-any_0_amd64.deb
- 0000000000000000000000000000000000000000000000000000000000000000 0 test-source_0_amd64.buildinfo
 Files:
  00000000000000000000000000000000 0 test optional test-binary-all_0_all.deb
  00000000000000000000000000000000 0 test optional test-binary-any_0_amd64.deb
- 00000000000000000000000000000000 0 test optional test-source_0_amd64.buildinfo
diff -Nru dpkg-1.18.23ubuntu1/scripts/t/dpkg_buildpackage/test-source_0_full.changes dpkg-1.18.23ubuntu2/scripts/t/dpkg_buildpackage/test-source_0_full.changes
--- dpkg-1.18.23ubuntu1/scripts/t/dpkg_buildpackage/test-source_0_full.changes	2017-02-22 21:50:39.000000000 +0000
+++ dpkg-1.18.23ubuntu2/scripts/t/dpkg_buildpackage/test-source_0_full.changes	2017-04-21 01:42:39.000000000 +0000
@@ -21,16 +21,13 @@
  0000000000000000000000000000000000000000 0 test-source_0.tar.xz
  0000000000000000000000000000000000000000 0 test-binary-all_0_all.deb
  0000000000000000000000000000000000000000 0 test-binary-any_0_amd64.deb
- 0000000000000000000000000000000000000000 0 test-source_0_amd64.buildinfo
 Checksums-Sha256:
  0000000000000000000000000000000000000000000000000000000000000000 0 test-source_0.dsc
  0000000000000000000000000000000000000000000000000000000000000000 0 test-source_0.tar.xz
  0000000000000000000000000000000000000000000000000000000000000000 0 test-binary-all_0_all.deb
  0000000000000000000000000000000000000000000000000000000000000000 0 test-binary-any_0_amd64.deb
- 0000000000000000000000000000000000000000000000000000000000000000 0 test-source_0_amd64.buildinfo
 Files:
  00000000000000000000000000000000 0 test optional test-source_0.dsc
  00000000000000000000000000000000 0 test optional test-source_0.tar.xz
  00000000000000000000000000000000 0 test optional test-binary-all_0_all.deb
  00000000000000000000000000000000 0 test optional test-binary-any_0_amd64.deb
- 00000000000000000000000000000000 0 test optional test-source_0_amd64.buildinfo
diff -Nru dpkg-1.18.23ubuntu1/scripts/t/dpkg_buildpackage/test-source_0_source.changes dpkg-1.18.23ubuntu2/scripts/t/dpkg_buildpackage/test-source_0_source.changes
--- dpkg-1.18.23ubuntu1/scripts/t/dpkg_buildpackage/test-source_0_source.changes	2017-02-22 21:50:39.000000000 +0000
+++ dpkg-1.18.23ubuntu2/scripts/t/dpkg_buildpackage/test-source_0_source.changes	2017-04-21 01:42:39.000000000 +0000
@@ -19,12 +19,9 @@
 Checksums-Sha1:
  0000000000000000000000000000000000000000 0 test-source_0.dsc
  0000000000000000000000000000000000000000 0 test-source_0.tar.xz
- 0000000000000000000000000000000000000000 0 test-source_0_source.buildinfo
 Checksums-Sha256:
  0000000000000000000000000000000000000000000000000000000000000000 0 test-source_0.dsc
  0000000000000000000000000000000000000000000000000000000000000000 0 test-source_0.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 0 test-source_0_source.buildinfo
 Files:
  00000000000000000000000000000000 0 test optional test-source_0.dsc
  00000000000000000000000000000000 0 test optional test-source_0.tar.xz
- 00000000000000000000000000000000 0 test optional test-source_0_source.buildinfo