diff -pruN 0.16.40/debian/changelog 0.16.40ubuntu1/debian/changelog
--- 0.16.40/debian/changelog	2025-10-18 01:43:28.000000000 +0000
+++ 0.16.40ubuntu1/debian/changelog	2025-10-18 17:48:50.000000000 +0000
@@ -1,9 +1,23 @@
+haskell-devscripts (0.16.40ubuntu1) resolute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Disable -Wl,-Bsymbolic-functions to fix broken builds.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 18 Oct 2025 19:48:50 +0200
+
 haskell-devscripts (0.16.40) unstable; urgency=medium
 
   * dh_haskell_provides_ghc: only operate on -dev and -prof packages
 
  -- Scott Talbert <swt@techie.net>  Fri, 17 Oct 2025 21:43:28 -0400
 
+haskell-devscripts (0.16.39ubuntu1) resolute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Disable -Wl,-Bsymbolic-functions to fix broken builds.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 17 Oct 2025 23:16:30 +0200
+
 haskell-devscripts (0.16.39) unstable; urgency=medium
 
   * Only provide $haskell:ghc-package substvar for -dev pkgs (Closes: #1118032)
@@ -52,6 +66,15 @@ haskell-devscripts (0.16.35) experimenta
 
  -- Clint Adams <clint@debian.org>  Fri, 12 Sep 2025 14:56:58 -0400
 
+haskell-devscripts (0.16.34ubuntu2) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Disable -Wl,-Bsymbolic-functions to fix broken builds.
+  * Drop langcore.mk inclusion, this has been fixed in gcc/dpkg side
+    differently
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 18 Dec 2024 23:36:35 +0100
+
 haskell-devscripts (0.16.34) unstable; urgency=medium
 
   [ Holger Levsen ]
@@ -63,12 +86,39 @@ haskell-devscripts (0.16.34) unstable; u
 
  -- Ilias Tsitsimpis <iliastsi@debian.org>  Mon, 16 Dec 2024 21:13:53 +0200
 
+haskell-devscripts (0.16.33ubuntu2) oracular; urgency=medium
+
+  * Include langcore.mk, this fixes FTBFS due to changes in dpkg and cdbs 0.4.166ubuntu1
+    (LP: #2071468)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 09 Jul 2024 17:26:03 +0200
+
+haskell-devscripts (0.16.33ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Disable -Wl,-Bsymbolic-functions to fix broken builds.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 29 Nov 2023 12:07:15 +0100
+
 haskell-devscripts (0.16.33) unstable; urgency=medium
 
   * Remove debian/tmp-setup-hs directory in clean target
 
  -- Scott Talbert <swt@techie.net>  Tue, 28 Nov 2023 22:35:12 -0500
 
+haskell-devscripts (0.16.32ubuntu2) noble; urgency=medium
+
+  * Rebuild against new GHC ABI.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 11 Nov 2023 08:37:15 +0100
+
+haskell-devscripts (0.16.32ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Disable -Wl,-Bsymbolic-functions to fix broken builds.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 26 Oct 2023 09:10:01 +0200
+
 haskell-devscripts (0.16.32) unstable; urgency=medium
 
   * Canonicalize paths in dh_haskell_recommends_documentation_references
@@ -81,12 +131,27 @@ haskell-devscripts (0.16.31) unstable; u
 
  -- Ilias Tsitsimpis <iliastsi@debian.org>  Tue, 19 Sep 2023 22:02:36 +0300
 
+haskell-devscripts (0.16.30ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Disable -Wl,-Bsymbolic-functions to fix broken builds.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 27 Aug 2023 08:54:30 +0200
+
 haskell-devscripts (0.16.30) unstable; urgency=medium
 
   * Add compatibility for GHC 9.4
 
  -- Ilias Tsitsimpis <iliastsi@debian.org>  Fri, 25 Aug 2023 19:19:25 +0300
 
+haskell-devscripts (0.16.29ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Disable -Wl,-Bsymbolic-functions to fix broken builds, thanks
+      to Gianfranco Costamagna.  LP: #1982554.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 03 Oct 2022 09:17:22 +0200
+
 haskell-devscripts (0.16.29) unstable; urgency=medium
 
   * Re-define the 'debian/tmp-inst-%' target (Closes: #1020072, #1020206,
@@ -104,6 +169,25 @@ haskell-devscripts (0.16.28) unstable; u
 
  -- Clint Adams <clint@debian.org>  Tue, 06 Sep 2022 16:32:30 -0400
 
+haskell-devscripts (0.16.27ubuntu3) kinetic; urgency=medium
+
+  * Fix bug that causes empty packages to be output.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 04 Sep 2022 00:39:09 +0000
+
+haskell-devscripts (0.16.27ubuntu2) kinetic; urgency=medium
+
+  * Fix hlibrary.mk to not build docs in the binary-arch target
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 02 Sep 2022 20:47:46 +0000
+
+haskell-devscripts (0.16.27ubuntu1) kinetic; urgency=medium
+
+  * Disable -Wl,-Bsymbolic-functions to fix broken builds, thanks
+    to Gianfranco Costamagna.  LP: #1982554.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 22 Aug 2022 21:38:12 +0000
+
 haskell-devscripts (0.16.27) unstable; urgency=medium
 
   * Fix GetCabalVersion.hs on GHC 8.8.4
diff -pruN 0.16.40/hlibrary.mk 0.16.40ubuntu1/hlibrary.mk
--- 0.16.40/hlibrary.mk	2025-10-18 01:41:07.000000000 +0000
+++ 0.16.40ubuntu1/hlibrary.mk	2025-10-18 09:27:01.000000000 +0000
@@ -19,6 +19,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307 USA.
 
+export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
+
 export GREP_OPTIONS :=
 
 # DH_haskell.sh uses shell features
