diff -pruN 5.0.8-8/debian/changelog 5.0.8-8ubuntu1/debian/changelog
--- 5.0.8-8/debian/changelog	2025-09-05 14:55:38.000000000 +0000
+++ 5.0.8-8ubuntu1/debian/changelog	2025-09-06 13:03:06.000000000 +0000
@@ -1,3 +1,9 @@
+openmpi (5.0.8-8ubuntu1) questing; urgency=medium
+
+  * Really fix hard-coded fortran mod directory in patches.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 06 Sep 2025 15:03:06 +0200
+
 openmpi (5.0.8-8) unstable; urgency=medium
 
   * Fix hard-coded fortran mod directory in patch. Closes: #1097520
diff -pruN 5.0.8-8/debian/patches/mpifort.patch 5.0.8-8ubuntu1/debian/patches/mpifort.patch
--- 5.0.8-8/debian/patches/mpifort.patch	2025-09-05 14:55:38.000000000 +0000
+++ 5.0.8-8ubuntu1/debian/patches/mpifort.patch	2025-09-06 13:02:23.000000000 +0000
@@ -22,7 +22,7 @@ Forwarded: not-needed
  required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@
 +# The same includedir is used in mpif77 and mpif90; so link the mod files in there
 +# but set fmoddir and use it where possible
-+fmoddir=${libdir}/../../fortran/gfortran-mod-15
++fmoddir=${libdir}/../../fortran/gfortran-mod-16
  includedir=${includedir}
 -libdir=${libdir}
 +libdir=${libdir}
diff -pruN 5.0.8-8/debian/patches/pkg-config.patch 5.0.8-8ubuntu1/debian/patches/pkg-config.patch
--- 5.0.8-8/debian/patches/pkg-config.patch	2025-09-05 14:55:38.000000000 +0000
+++ 5.0.8-8ubuntu1/debian/patches/pkg-config.patch	2025-09-06 13:01:32.000000000 +0000
@@ -22,7 +22,7 @@ Index: openmpi-5.0.5/ompi/tools/wrappers
 +Libs:  @OMPI_PC_FC_LIBS@
 +Libs.private:  @OMPI_PC_FC_LIBS_PRIVATE@
 +
-+Cflags: -I${libdir}/../../fortran/gfortran-mod-15/openmpi @OMPI_PC_FC_CFLAGS@
++Cflags: -I${libdir}/../../fortran/gfortran-mod-16/openmpi @OMPI_PC_FC_CFLAGS@
  Requires: @OMPI_PC_MODULES@
  Requires.private: @OMPI_PC_MODULES_PRIVATE@
 Index: openmpi-5.0.5/ompi/tools/wrappers/ompi.pc.in
@@ -38,6 +38,6 @@ Index: openmpi-5.0.5/ompi/tools/wrappers
 -Cflags: @OMPI_PC_CFLAGS@
 +Libs: @OMPI_PC_FC_LIBS@
 +Libs.private: @OMPI_PC_FC_LIBS_PRIVATE@
-+Cflags: -I${libdir}/../../fortran/gfortran-mod-15/openmpi @OMPI_PC_CFLAGS@
++Cflags: -I${libdir}/../../fortran/gfortran-mod-16/openmpi @OMPI_PC_CFLAGS@
  Requires: @OMPI_PC_MODULES@
  Requires.private: @OMPI_PC_MODULES_PRIVATE@