diff -Nru openbsc-1.4.0+dfsg1/debian/changelog openbsc-1.4.0+dfsg1/debian/changelog
--- openbsc-1.4.0+dfsg1/debian/changelog	2021-01-06 19:54:13.000000000 +0000
+++ openbsc-1.4.0+dfsg1/debian/changelog	2021-05-10 01:57:36.000000000 +0000
@@ -1,3 +1,11 @@
+openbsc (1.4.0+dfsg1-1ubuntu1) impish; urgency=medium
+
+  * Restore doko's patch from 1.3.2+dfsg1-2ubuntu2 to not build with
+    -Werror=null-dereference, as it is still necessary with the new upstream
+    release.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 09 May 2021 21:57:36 -0400
+
 openbsc (1.4.0+dfsg1-1) unstable; urgency=medium
 
   * New upstream release (Closes: #898109)
diff -Nru openbsc-1.4.0+dfsg1/debian/control openbsc-1.4.0+dfsg1/debian/control
--- openbsc-1.4.0+dfsg1/debian/control	2021-01-06 19:35:47.000000000 +0000
+++ openbsc-1.4.0+dfsg1/debian/control	2021-05-10 01:57:36.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 -Nru openbsc-1.4.0+dfsg1/debian/patches/no-Werror=null-dereference.diff openbsc-1.4.0+dfsg1/debian/patches/no-Werror=null-dereference.diff
--- openbsc-1.4.0+dfsg1/debian/patches/no-Werror=null-dereference.diff	1970-01-01 00:00:00.000000000 +0000
+++ openbsc-1.4.0+dfsg1/debian/patches/no-Werror=null-dereference.diff	2021-05-10 01:57:04.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 -Nru openbsc-1.4.0+dfsg1/debian/patches/series openbsc-1.4.0+dfsg1/debian/patches/series
--- openbsc-1.4.0+dfsg1/debian/patches/series	2021-01-06 19:54:13.000000000 +0000
+++ openbsc-1.4.0+dfsg1/debian/patches/series	2021-05-10 01:57:33.000000000 +0000
@@ -1,2 +1,3 @@
 lintian-spelling.patch
 set_version_explicitly.patch
+no-Werror=null-dereference.diff