diff -pruN 1.4.1+dfsg1-2/debian/changelog 1.4.1+dfsg1-2ubuntu2/debian/changelog
--- 1.4.1+dfsg1-2/debian/changelog	2022-03-17 16:51:42.000000000 +0000
+++ 1.4.1+dfsg1-2ubuntu2/debian/changelog	2022-05-11 08:37:35.000000000 +0000
@@ -1,3 +1,11 @@
+openbsc (1.4.1+dfsg1-2ubuntu2) kinetic; urgency=medium
+
+  * Fix build failure with installed systemd (See e.g. Debian bug: #1010578)
+  * Restore doko's patch to not build with -Werror=null-dereference,
+    as it is still necessary with the new upstream release.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 11 May 2022 10:37:35 +0200
+
 openbsc (1.4.1+dfsg1-2) unstable; urgency=medium
 
   * upload to unstable
diff -pruN 1.4.1+dfsg1-2/debian/patches/no-Werror=null-dereference.diff 1.4.1+dfsg1-2ubuntu2/debian/patches/no-Werror=null-dereference.diff
--- 1.4.1+dfsg1-2/debian/patches/no-Werror=null-dereference.diff	1970-01-01 00:00:00.000000000 +0000
+++ 1.4.1+dfsg1-2ubuntu2/debian/patches/no-Werror=null-dereference.diff	2022-05-11 08:37:35.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.4.1+dfsg1-2/debian/patches/series 1.4.1+dfsg1-2ubuntu2/debian/patches/series
--- 1.4.1+dfsg1-2/debian/patches/series	2022-03-17 16:51:42.000000000 +0000
+++ 1.4.1+dfsg1-2ubuntu2/debian/patches/series	2022-05-11 08:37:35.000000000 +0000
@@ -1,2 +1,3 @@
 lintian-spelling.patch
 set_version_explicitly.patch
+no-Werror=null-dereference.diff
diff -pruN 1.4.1+dfsg1-2/debian/rules 1.4.1+dfsg1-2ubuntu2/debian/rules
--- 1.4.1+dfsg1-2/debian/rules	2022-03-17 16:51:42.000000000 +0000
+++ 1.4.1+dfsg1-2ubuntu2/debian/rules	2022-05-11 08:37:25.000000000 +0000
@@ -16,7 +16,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardeni
 	dh $@ --sourcedirectory=openbsc --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure --sourcedirectory=openbsc -- --enable-nat --enable-osmo-bsc --enable-smpp
+	dh_auto_configure --sourcedirectory=openbsc -- --enable-nat --enable-osmo-bsc --enable-smpp --with-systemdsystemunitdir=no
 
 override_dh_clean:
 	$(RM) openbsc/.version openbsc/tests/package.m4 openbsc/tests/testsuite