diff -Nru debhelper-10.2.2ubuntu1/debian/changelog debhelper-10.2.2ubuntu2/debian/changelog
--- debhelper-10.2.2ubuntu1/debian/changelog	2016-10-17 21:34:23.000000000 +0200
+++ debhelper-10.2.2ubuntu2/debian/changelog	2016-10-18 15:25:29.000000000 +0200
@@ -1,3 +1,17 @@
+debhelper (10.2.2ubuntu2) UNRELEASED; urgency=medium
+
+  * Enable building of dbgsym packages, deprecating pkg-create-dbgsym:
+    - dh_strip: Drop disabling of ddebs by default.
+    - dh_builddeb: Use .ddeb suffix for dbgsym packages to work with current
+      Launchpad.
+    - dh_gencontrol: Don't add ddebs to debian/files. It's too expensive/error
+      prone to determine the final .deb name again there, let dh_builddeb do
+      that via dpkg-distaddfile after determining the name.
+    - Conflict to pkg-create-dbgsym.
+    - LP: #1623256
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 18 Oct 2016 15:25:29 +0200
+
 debhelper (10.2.2ubuntu1) zesty; urgency=medium
 
   * Merge from Debian unstable.  Remaining changes:
diff -Nru debhelper-10.2.2ubuntu1/debian/control debhelper-10.2.2ubuntu2/debian/control
--- debhelper-10.2.2ubuntu1/debian/control	2016-10-17 21:34:19.000000000 +0200
+++ debhelper-10.2.2ubuntu2/debian/control	2016-10-18 15:25:29.000000000 +0200
@@ -29,6 +29,7 @@
 Breaks: dh-systemd (<< 1.38)
 Replaces: dh-systemd (<< 1.38)
 Suggests: dh-make
+Conflicts: pkg-create-dbgsym
 Multi-Arch: foreign
 Description: helper programs for debian/rules
  A collection of programs that can be used in a debian/rules file to
diff -Nru debhelper-10.2.2ubuntu1/dh_builddeb debhelper-10.2.2ubuntu2/dh_builddeb
--- debhelper-10.2.2ubuntu1/dh_builddeb	2016-10-02 22:06:36.000000000 +0200
+++ debhelper-10.2.2ubuntu2/dh_builddeb	2016-10-18 15:25:29.000000000 +0200
@@ -9,6 +9,7 @@
 use strict;
 use warnings;
 use Debian::Debhelper::Dh_Lib;
+use Dpkg::Control;
 
 =head1 SYNOPSIS
 
@@ -153,8 +154,12 @@
 			# the dbgsym package.
 			my @args = default_compressor_args(["-z1", "-Zxz", "-Sextreme"],
 											   @{$dh{U_PARAMS}});
+			my $c = Dpkg::Control->new(type => CTRL_INFO_PKG);
+			$c->load($dbgsym_control);
+			my $ddebname = $c->{Package} . '_' . $c->{Version} . '_' . $c->{Architecture} . '.ddeb';
 			doit("dpkg-deb", @args,
-				 "--build", $dbgsym_tmpdir, $dh{DESTDIR});
+				 "--build", $dbgsym_tmpdir, $dh{DESTDIR} . '/' . $ddebname);
+			doit("dpkg-distaddfile", $ddebname, $c->{Section}, $c->{Priority});
 		} elsif (not is_udeb($package)) {
 			warning("Not building dbgsym package for ${package} as it has no control file");
 			warning("Please use dh_gencontrol to avoid this issue");
diff -Nru debhelper-10.2.2ubuntu1/dh_gencontrol debhelper-10.2.2ubuntu2/dh_gencontrol
--- debhelper-10.2.2ubuntu1/dh_gencontrol	2016-10-02 22:35:36.000000000 +0200
+++ debhelper-10.2.2ubuntu2/dh_gencontrol	2016-10-18 15:25:29.000000000 +0200
@@ -124,6 +124,10 @@
 		}
 		install_dir("${dbgsym_tmp}/DEBIAN");
 		doit("dpkg-gencontrol", "-p${package}", "-l$changelog", "-T$substvars",
+			# Ubuntu: don't write to debian/files here; we need to name it
+			# .ddeb and it's too expensive to figure out the name here; let
+			# dh_builddeb do that
+			"-fdebian/.debhelper/null",
 			"-P${dbgsym_tmp}",@{$dh{U_PARAMS}}, @dbgsym_options);
 
 		reset_perm_and_owner('0644', "${dbgsym_tmp}/DEBIAN/control");
diff -Nru debhelper-10.2.2ubuntu1/dh_strip debhelper-10.2.2ubuntu2/dh_strip
--- debhelper-10.2.2ubuntu1/dh_strip	2016-10-17 21:34:19.000000000 +0200
+++ debhelper-10.2.2ubuntu2/dh_strip	2016-10-18 13:17:06.000000000 +0200
@@ -166,8 +166,6 @@
 	error("--dbgsym-migration and --no-automatic-dbgsym are mutually exclusive");
 }
 
-$dh{ENABLE_DBGSYM} = 0 if not $ENV{'DH_BUILD_DDEBS'};
-
 # This variable can be used to turn off stripping (see Policy).
 if (get_buildoption('nostrip')) {
 	exit;