diff -pruN 1.0-1/debian/changelog 1.0-1ubuntu1/debian/changelog
--- 1.0-1/debian/changelog	2025-08-16 21:44:39.000000000 +0000
+++ 1.0-1ubuntu1/debian/changelog	2025-11-21 17:36:13.000000000 +0000
@@ -1,3 +1,18 @@
+mmc-utils (1.0-1ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2132140).
+    Remaining changes:
+    - d/rules: undefine _FORTIFY_SOURCE as its already set to the highest
+      value that builds by the upstream code
+    Dropped changes:
+    - Fix various compiler nitpicks resulting in an FTBFS.
+    The former delta was mostly a result of building with _FORTIFY_SOURCE=3.
+    That didn't really worked, was broken, and wasn't applicable anymore with
+    the new version. Instead, the package is now back to building with
+    _FORTIFY_SOURCE=2, with a one-line delta in d/rules.
+
+ -- Florent 'Skia' Jacquet <skia@ubuntu.com>  Fri, 21 Nov 2025 18:36:13 +0100
+
 mmc-utils (1.0-1) unstable; urgency=medium
 
   * Update to v1.0.
@@ -13,6 +28,12 @@ mmc-utils (1.0-1) unstable; urgency=medi
 
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Sun, 17 Aug 2025 06:44:39 +0900
 
+mmc-utils (0+git20240329.f757f413-1ubuntu1) plucky; urgency=medium
+
+  * Fix various compiler nitpicks resulting in an FTBFS.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 08 Mar 2025 12:27:29 -0600
+
 mmc-utils (0+git20240329.f757f413-1) unstable; urgency=medium
 
   * Snapshot, taken from the master (20240329) (Closes: #1030829)
diff -pruN 1.0-1/debian/control 1.0-1ubuntu1/debian/control
--- 1.0-1/debian/control	2025-08-16 21:44:39.000000000 +0000
+++ 1.0-1ubuntu1/debian/control	2025-11-21 17:36:13.000000000 +0000
@@ -1,7 +1,8 @@
 Source: mmc-utils
 Section: utils
 Priority: optional
-Maintainer: Nobuhiro Iwamatsu <iwamatsu@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Nobuhiro Iwamatsu <iwamatsu@debian.org>
 Build-Depends: debhelper-compat (= 13)
 Standards-Version: 4.7.2
 Rules-Requires-Root: no
diff -pruN 1.0-1/debian/rules 1.0-1ubuntu1/debian/rules
--- 1.0-1/debian/rules	2025-08-16 21:44:39.000000000 +0000
+++ 1.0-1ubuntu1/debian/rules	2025-11-21 17:36:13.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DEB_CPPFLAGS_MAINT_APPEND=-U_FORTIFY_SOURCE
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/pkg-info.mk