diff --git a/debian/changelog b/debian/changelog
index e1af074..20eb0d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+iniparser (4.1-6ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable (LP: #1959346). Remaining changes:
+    - Improvements to build steps such that objects from test get cleaned up
+  * Removed patches obsoleted/merged by upstream:
+    - Genericize long int tests to accomodate where sizeof(long int) != 8
+    - Change tests so that a test failure will stop the build
+    - Incorporate upstream commit 2412f165bcfde4ad8e3426fd59f2a920492b8c19
+      from PR #104 to address likely 1 byte stack buffer overflow
+      (thanks Edik Ponomarenko)
+
+ -- Dave Jones <dave.jones@canonical.com>  Thu, 27 Jan 2022 23:02:36 +0000
+
 iniparser (4.1-6) unstable; urgency=medium
 
   * debian/watch: Watch for tagged releases on github
@@ -27,6 +40,29 @@ iniparser (4.1-5) unstable; urgency=medium
 
  -- Salvatore Bonaccorso <carnil@debian.org>  Sun, 05 Dec 2021 10:06:09 +0100
 
+iniparser (4.1-4ubuntu3) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 07 Oct 2021 12:12:58 +0200
+
+iniparser (4.1-4ubuntu2) hirsute; urgency=medium
+
+  * Genericize long int tests to accomodate where sizeof(long int) != 8
+    (LP: #1918456)
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Tue, 16 Mar 2021 11:42:53 -0600
+
+iniparser (4.1-4ubuntu1) hirsute; urgency=medium
+
+  * Change tests so that a test failure will stop the build (LP: #1915866)
+  * Improvements to build steps such that objects from test get cleaned up
+  * Incorporate upstream commit 2412f165bcfde4ad8e3426fd59f2a920492b8c19 from
+    PR #104 to address likely 1 byte stack buffer overflow
+    (thanks Edik Ponomarenko)
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Mon, 01 Mar 2021 08:18:51 -0700
+
 iniparser (4.1-4) unstable; urgency=medium
 
   * Add an initial Gitlab CI config file
diff --git a/debian/control b/debian/control
index b2d605d..d10f961 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: iniparser
 Section: libs
 Priority: optional
-Maintainer: Salvatore Bonaccorso <carnil@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Salvatore Bonaccorso <carnil@debian.org>
 Build-Depends: debhelper-compat (= 13), cmake, doxygen
 Standards-Version: 4.6.0
 Homepage: http://ndevilla.free.fr/iniparser/
diff --git a/debian/patches/cmake-test-clean.patch b/debian/patches/cmake-test-clean.patch
new file mode 100644
index 0000000..78b228e
--- /dev/null
+++ b/debian/patches/cmake-test-clean.patch
@@ -0,0 +1,15 @@
+Index: iniparser-4.1/CMakeLists.txt
+===================================================================
+--- iniparser-4.1.orig/CMakeLists.txt
++++ iniparser-4.1/CMakeLists.txt
+@@ -44,6 +44,10 @@ enable_testing()
+ add_test(NAME testsuite
+   COMMAND make
+   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
++add_test(NAME testclean
++  COMMAND make clean
++  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
++set_tests_properties(testclean PROPERTIES DEPENDS testsuite)
+ 
+ install (FILES ${INIPARSER_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iniparser)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 256da9e..0edcbbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ Fail-testrun-on-test-failure.patch
 Updated-test-for-when-long-int-is-not-8-byte.patch
 Don-t-send-a-const-ptr-to-asprintf.patch
 test-testiniparser.c-fix-missing-comma-in-token-test.patch
+cmake-test-clean.patch