diff -Nru pdbg-1.0/debian/changelog pdbg-1.0/debian/changelog
--- pdbg-1.0/debian/changelog	2017-10-06 13:55:13.000000000 +0000
+++ pdbg-1.0/debian/changelog	2018-04-09 23:18:46.000000000 +0000
@@ -1,3 +1,10 @@
+pdbg (1.0-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/use-debian-libfdt.patch: -lfdt needs to be in _LDADD,
+    not _LDFLAGS, for use with Ubuntu's toolchain.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 09 Apr 2018 16:18:46 -0700
+
 pdbg (1.0-1) unstable; urgency=medium
 
   * Initial release. (Closes: #883175)
diff -Nru pdbg-1.0/debian/control pdbg-1.0/debian/control
--- pdbg-1.0/debian/control	2017-10-06 13:55:13.000000000 +0000
+++ pdbg-1.0/debian/control	2018-04-09 23:18:46.000000000 +0000
@@ -1,7 +1,8 @@
 Source: pdbg
 Section: misc
 Priority: optional
-Maintainer: Frédéric Bonnard <frediz@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Frédéric Bonnard <frediz@debian.org>
 Build-Depends: debhelper (>= 9.0.0), dh-autoreconf, device-tree-compiler, git, libfdt-dev
 Standards-Version: 4.1.1
 Homepage: https://github.com/open-power/pdbg
diff -Nru pdbg-1.0/debian/patches/use-debian-libfdt.patch pdbg-1.0/debian/patches/use-debian-libfdt.patch
--- pdbg-1.0/debian/patches/use-debian-libfdt.patch	2017-10-06 13:55:13.000000000 +0000
+++ pdbg-1.0/debian/patches/use-debian-libfdt.patch	2018-04-09 23:18:46.000000000 +0000
@@ -2,10 +2,15 @@
  pdbg embeds libfdt, but in Debian libfdt is packaged and we prefer to make use
  of it. So we just disable that in Makefile.am and switch to the installed libfdt-dev
 Author: Frédéric Bonnard <frediz@debian.org>
+Author: Steve Langasek <steve.langasek@ubuntu.com>
+Last-Modified: 2018-04-09
+
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Makefile.am
-+++ b/Makefile.am
+Index: pdbg-1.0/Makefile.am
+===================================================================
+--- pdbg-1.0.orig/Makefile.am
++++ pdbg-1.0/Makefile.am
 @@ -1,7 +1,5 @@
  GIT_SHA1 = `git --work-tree=$(top_srcdir) --git-dir=$(top_srcdir)/.git describe --always --long --dirty || echo unknown`
  
@@ -14,16 +19,16 @@
  bin_PROGRAMS = pdbg
  
  ACLOCAL_AMFLAGS = -Im4
-@@ -10,28 +8,16 @@
+@@ -10,28 +8,16 @@ AM_CFLAGS = -I$(top_srcdir)/ccan/array_s
  pdbg_SOURCES = \
  	src/main.c
  pdbg_LDADD = fake.dtb.o p8-fsi.dtb.o p8-i2c.dtb.o p9w-fsi.dtb.o	\
 -	p9z-fsi.dtb.o p9r-fsi.dtb.o p9-kernel.dtb.o libpdbg.la libfdt.la \
+-	-L.libs
 +	p9z-fsi.dtb.o p9r-fsi.dtb.o p9-kernel.dtb.o libpdbg.la  \
- 	-L.libs
++	-L.libs -lfdt
  
--pdbg_LDFLAGS = -Wl,--whole-archive,-lpdbg,--no-whole-archive
-+pdbg_LDFLAGS = -Wl,--whole-archive,-lpdbg,--no-whole-archive -lfdt
+ pdbg_LDFLAGS = -Wl,--whole-archive,-lpdbg,--no-whole-archive
  pdbg_CFLAGS = -I$(top_srcdir)/libpdbg -Wall -Werror -DGIT_SHA1=\"${GIT_SHA1}\"
  
 -lib_LTLIBRARIES = libpdbg.la libfdt.la