diff -pruN 1.3.2+dfsg1-2/debian/changelog 1.3.2+dfsg1-2ubuntu2/debian/changelog
--- 1.3.2+dfsg1-2/debian/changelog	2020-12-12 16:00:34.000000000 +0000
+++ 1.3.2+dfsg1-2ubuntu2/debian/changelog	2020-12-14 11:47:31.000000000 +0000
@@ -1,3 +1,10 @@
+openbsc (1.3.2+dfsg1-2ubuntu2) hirsute; urgency=medium
+
+  * Don't build with -Werror=null-dereference. Fails with -O3 on ppc64el,
+    and with -O2 on s390x (more agressive inlining and loop unrolling).
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 14 Dec 2020 12:47:31 +0100
+
 openbsc (1.3.2+dfsg1-2) unstable; urgency=medium
 
   * upload to unstable
@@ -19,6 +26,13 @@ openbsc (1.1.0-3) unstable; urgency=low
 
  -- Thorsten Alteholz <debian@alteholz.de>  Wed, 05 Aug 2020 20:51:19 +0200
 
+openbsc (1.1.0-2ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Build with -O2 on ppc64el, working around a ftbfs.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 13 Nov 2018 08:19:33 -0800
+
 openbsc (1.1.0-2) unstable; urgency=low
 
   * Upload to unstable
@@ -37,6 +51,24 @@ openbsc (1.1.0-1) experimental; urgency=
 
  -- Thorsten Alteholz <debian@alteholz.de>  Fri, 22 Jun 2018 19:27:08 +0200
 
+openbsc (1.0.0-2ubuntu1) cosmic; urgency=medium
+
+  * Build with -O2 on ppc64el, working around a ftbfs. See #898109.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 13 May 2018 13:49:11 -0400
+
+openbsc (1.0.0-2build2) cosmic; urgency=medium
+
+  * No-change rebuild for osmo soname changes.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 07 May 2018 09:22:10 +0000
+
+openbsc (1.0.0-2build1) cosmic; urgency=medium
+
+  * No-change rebuild for osmo soname changes.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 06 May 2018 09:48:21 +0200
+
 openbsc (1.0.0-2) unstable; urgency=medium
 
   * debian/rules: remove arch specific commands (Closes: #896193)
@@ -89,3 +121,4 @@ openbsc (0.15.0-1) unstable; urgency=low
   * Initial release (Closes: #806583)
 
  -- Ruben Undheim <ruben.undheim@gmail.com>  Sat, 20 Feb 2016 18:21:53 +0100
+
diff -pruN 1.3.2+dfsg1-2/debian/control 1.3.2+dfsg1-2ubuntu2/debian/control
--- 1.3.2+dfsg1-2/debian/control	2020-12-12 16:00:34.000000000 +0000
+++ 1.3.2+dfsg1-2ubuntu2/debian/control	2020-12-14 11:47:31.000000000 +0000
@@ -1,5 +1,6 @@
 Source: openbsc
-Maintainer: Debian Mobcom Maintainers <Debian-mobcom-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Mobcom Maintainers <Debian-mobcom-maintainers@lists.alioth.debian.org>
 Uploaders: Ruben Undheim <ruben.undheim@gmail.com>
          , Thorsten Alteholz <debian@alteholz.de>
 Section: net
diff -pruN 1.3.2+dfsg1-2/debian/patches/no-Werror=null-dereference.diff 1.3.2+dfsg1-2ubuntu2/debian/patches/no-Werror=null-dereference.diff
--- 1.3.2+dfsg1-2/debian/patches/no-Werror=null-dereference.diff	1970-01-01 00:00:00.000000000 +0000
+++ 1.3.2+dfsg1-2ubuntu2/debian/patches/no-Werror=null-dereference.diff	2020-12-14 11:47:31.000000000 +0000
@@ -0,0 +1,10 @@
+--- a/openbsc/configure.ac
++++ b/openbsc/configure.ac
+@@ -145,7 +145,6 @@ AC_SUBST(SYMBOL_VISIBILITY)
+ AX_CHECK_COMPILE_FLAG([-Werror=implicit], [CFLAGS="$CFLAGS -Werror=implicit"])
+ AX_CHECK_COMPILE_FLAG([-Werror=maybe-uninitialized], [CFLAGS="$CFLAGS -Werror=maybe-uninitialized"])
+ AX_CHECK_COMPILE_FLAG([-Werror=memset-transposed-args], [CFLAGS="$CFLAGS -Werror=memset-transposed-args"])
+-AX_CHECK_COMPILE_FLAG([-Werror=null-dereference], [CFLAGS="$CFLAGS -Werror=null-dereference"])
+ AX_CHECK_COMPILE_FLAG([-Werror=sizeof-array-argument], [CFLAGS="$CFLAGS -Werror=sizeof-array-argument"])
+ AX_CHECK_COMPILE_FLAG([-Werror=sizeof-pointer-memaccess], [CFLAGS="$CFLAGS -Werror=sizeof-pointer-memaccess"])
+ 
diff -pruN 1.3.2+dfsg1-2/debian/patches/series 1.3.2+dfsg1-2ubuntu2/debian/patches/series
--- 1.3.2+dfsg1-2/debian/patches/series	2020-12-12 16:00:34.000000000 +0000
+++ 1.3.2+dfsg1-2ubuntu2/debian/patches/series	2020-12-14 11:47:31.000000000 +0000
@@ -1,3 +1,4 @@
 lintian-spelling.patch
 set_version_explicitly.patch
 gcc10.patch
+no-Werror=null-dereference.diff