diff --git a/glibc.spec b/glibc.spec
index bfabc84..d88940b 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -2357,7 +2357,7 @@ update_gconv_modules_cache ()
 %endif
 
 %changelog
-* Tue Mar 03 2026 Eduard Abdullin <eabdullin@almalinux.org> - 2.39-115.alma.1
+* Thu Mar 05 2026 Eduard Abdullin <eabdullin@almalinux.org> - 2.39-116.alma.1
 - Overwrite target for x86_64_v2
 - Update patch-git.lua to handle AlmaLinux branches correctly
 
diff --git a/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/main.fmf b/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/main.fmf
index 31302be..39acd0b 100644
--- a/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/main.fmf
+++ b/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/main.fmf
@@ -14,5 +14,6 @@ recommend:
   - glibc
   - gdb
 duration: 15m
+order: 1000
 extra-summary: /tools/glibc/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries
 extra-task: /tools/glibc/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries
diff --git a/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/runtest.sh b/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/runtest.sh
index e40714d..31bdebe 100755
--- a/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/runtest.sh
+++ b/tests/Regression/bz1661513-glibc-Adjust-to-rpms-find-debuginfo-sh-changes-to-keep-stripping-binaries/runtest.sh
@@ -48,7 +48,7 @@ rlJournalStart
         rlAssertGrep "ldconfig.*, stripped" output.log
         rlAssertGrep "iconvconfig.*, stripped" output.log
         rlAssertGrep "localedef.*, stripped" output.log
-        rlAssertGrep "ld-.*, not stripped" output.log
+        rlAssertGrep "$(readlink -f /usr/bin/ld.so).*, not stripped" output.log
         rlLogInfo "Content of output.log:\n$(cat output.log)"
 
         # some debugging info (e.g. pthread struct) should be accessible even without installed debuginfo packages
diff --git a/wrap-find-debuginfo.sh b/wrap-find-debuginfo.sh
index 5257de7..7bc79aa 100644
--- a/wrap-find-debuginfo.sh
+++ b/wrap-find-debuginfo.sh
@@ -114,6 +114,13 @@ for ldso_debug_candidate in `find "$sysroot_path" -maxdepth 2 \
     fi
 done
 rm -f "$ldso_debug"
+# Same logic, but for installed ld-linux*.debug files, where the depth
+# is more and there may be more than one (32-bit and 64-bit)
+for ldso_debug_candidate in `find "$sysroot_path/usr/lib/debug" \
+    -regextype posix-extended \
+  -regex '.*/ld(-.*|64|)\.so\.[0-9]+.*debug$' -type f` ; do
+    rm -f "$ldso_debug_candidate"
+done
 
 # ld.so: Rewrite the source file paths to match the extracted
 # locations.  First compute the arguments for invoking debugedit.