diff -pruN 15.09a-3/debian/changelog 15.09a-3ubuntu1/debian/changelog
--- 15.09a-3/debian/changelog	2018-02-25 14:01:37.000000000 +0000
+++ 15.09a-3ubuntu1/debian/changelog	2018-09-08 20:37:54.000000000 +0000
@@ -1,3 +1,11 @@
+alljoyn-thin-client-1509 (15.09a-3ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/patches/link-pthread.patch: Add -pthread to LINKFLAGS to fix
+      FTBFS.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 08 Sep 2018 20:37:54 +0000
+
 alljoyn-thin-client-1509 (15.09a-3) unstable; urgency=medium
 
   * debian/control: use dh11
@@ -8,6 +16,12 @@ alljoyn-thin-client-1509 (15.09a-3) unst
 
  -- Thorsten Alteholz <debian@alteholz.de>  Sun, 25 Feb 2018 15:01:37 +0100
 
+alljoyn-thin-client-1509 (15.09a-2ubuntu1) artful; urgency=medium
+
+  * debian/patches/link-pthread.patch: Add -pthread to LINKFLAGS to fix FTBFS.
+
+ -- Logan Rosen <logan@ubuntu.com>  Tue, 20 Jun 2017 22:36:43 -0700
+
 alljoyn-thin-client-1509 (15.09a-2) unstable; urgency=medium
 
   * move package to debian-iot-maintainer
@@ -20,3 +34,4 @@ alljoyn-thin-client-1509 (15.09a-1) unst
   * Initial release (Closes: #828129)
 
  -- Thorsten Alteholz <debian@alteholz.de>  Sat, 25 Jun 2016 11:28:32 +0200
+
diff -pruN 15.09a-3/debian/control 15.09a-3ubuntu1/debian/control
--- 15.09a-3/debian/control	2018-02-25 14:01:37.000000000 +0000
+++ 15.09a-3ubuntu1/debian/control	2018-09-08 20:37:54.000000000 +0000
@@ -1,7 +1,8 @@
 Source: alljoyn-thin-client-1509
 Section: net
 Priority: optional
-Maintainer: Debian IoT Maintainers <debian-iot-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian IoT Maintainers <debian-iot-maintainers@lists.alioth.debian.org>
 Uploaders: Thorsten Alteholz <debian@alteholz.de>
 Build-Depends: dh-exec (>=0.3)
                , debhelper (>=11)
diff -pruN 15.09a-3/debian/patches/link-pthread.patch 15.09a-3ubuntu1/debian/patches/link-pthread.patch
--- 15.09a-3/debian/patches/link-pthread.patch	1970-01-01 00:00:00.000000000 +0000
+++ 15.09a-3ubuntu1/debian/patches/link-pthread.patch	2017-06-21 05:36:42.000000000 +0000
@@ -0,0 +1,13 @@
+Index: alljoyn-thin-client-1509-15.09a/SConscript.target.linux
+===================================================================
+--- alljoyn-thin-client-1509-15.09a.orig/SConscript.target.linux
++++ alljoyn-thin-client-1509-15.09a/SConscript.target.linux
+@@ -56,7 +56,7 @@ env.Append(CFLAGS = [
+     '-Werror=format-security',
+     '-Wwrite-strings'
+ ])
+-env.Append(LINKFLAGS = ['-fPIE', '-pie', '-fPIC'])
++env.Append(LINKFLAGS = ['-fPIE', '-pie', '-fPIC', '-pthread'])
+ env.Append(LINKFLAGS = ['-z', 'relro', '-z', 'now'])
+ env.Append(CPPFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
+ 
diff -pruN 15.09a-3/debian/patches/series 15.09a-3ubuntu1/debian/patches/series
--- 15.09a-3/debian/patches/series	2016-12-26 10:28:32.000000000 +0000
+++ 15.09a-3ubuntu1/debian/patches/series	2018-02-25 22:44:12.000000000 +0000
@@ -1,3 +1,4 @@
 soname.patch
 remove-makefile.patch
 hardening.patch
+link-pthread.patch
