diff --git a/sys-cluster/lmod/files/lmod-8.6.14-r1-make.patch b/sys-cluster/lmod/files/lmod-8.6.14-r1-make.patch
index a26feb93abb47..de6ac45e300f7 100644
--- a/sys-cluster/lmod/files/lmod-8.6.14-r1-make.patch
+++ b/sys-cluster/lmod/files/lmod-8.6.14-r1-make.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.in	2026-04-14 14:24:02.212885947 +0200
 +++ b/Makefile.in	2026-04-14 14:28:17.943984410 +0200
-@@ -203,7 +203,8 @@
+@@ -203,13 +203,15 @@
  	$(RM) -rf $(DESTDIR)$(MY_PKG_PACKAGE)
  	@echo "If you added lmod files to /etc/profile.d please remove them."
  
@@ -10,3 +10,11 @@
  
  lmod_install_targets: $(PKGS) lmodrc_init shell_init startup libexec               \
                        Inst_Tools Inst_Shells Inst_Settarg Inst_Lmod_MF other_tools \
+                       man_pages messageFns i18n spiderCacheSupport ksh_funcs
+ 
+-install: pre-install  zsh_tab_funcs fish_tab_funcs 
++install: pre-install
++	$(MAKE) zsh_tab_funcs fish_tab_funcs 
+ 	$(MAKE) PKGV=$(PKG) shell_init startup
+ 	@if test "$(SITE_CONTROLLED_PREFIX)" = "no" ; then                        \
+ 	   echo $(RM) $(DESTDIR)$(PKG);                                           \
diff --git a/sys-cluster/lmod/files/lmod-8.7.55-make.patch b/sys-cluster/lmod/files/lmod-8.7.55-make.patch
new file mode 100644
index 0000000000000..b9a1add16ed31
--- /dev/null
+++ b/sys-cluster/lmod/files/lmod-8.7.55-make.patch
@@ -0,0 +1,21 @@
+--- a/Makefile.in	2026-04-14 14:24:02.212885947 +0200
++++ b/Makefile.in	2026-04-14 14:28:17.943984410 +0200
+@@ -227,14 +227,16 @@
+ 	$(RM) -rf $(DESTDIR)$(MY_PKG_PACKAGE)
+ 	@echo "If you added lmod files to /etc/profile.d please remove them."
+ 
+-pre-install: $(DIRLIST) lmod_install_targets
++pre-install: $(DIRLIST)
++	$(MAKE) lmod_install_targets
+ 
+ lmod_install_targets: $(PKGS) lmodrc_init shell_init startup libexec VersionSrc    \
+                       Inst_Tools Inst_Shells Inst_Settarg Inst_Lmod_MF other_tools \
+                       man_pages messageFns i18n spiderCacheSupport ksh_funcs       \
+                       STVersionSrc
+ 
+-install: pre-install  zsh_tab_funcs fish_tab_funcs 
++install: pre-install
++	$(MAKE) zsh_tab_funcs fish_tab_funcs 
+ 	$(MAKE) PKGV=$(PKG) shell_init startup
+ 	@if test "$(SITE_CONTROLLED_PREFIX)" = "no" ; then                        \
+ 	   echo $(RM) $(DESTDIR)$(PKG);                                           \
diff --git a/sys-cluster/lmod/lmod-8.7.55.ebuild b/sys-cluster/lmod/lmod-8.7.55.ebuild
index 0347fc817d47b..1ef68347fdc73 100644
--- a/sys-cluster/lmod/lmod-8.7.55.ebuild
+++ b/sys-cluster/lmod/lmod-8.7.55.ebuild
@@ -47,7 +47,7 @@ BDEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.4.19-no-libsandbox.patch
-	"${FILESDIR}"/${PN}-8.6.14-r1-make.patch
+	"${FILESDIR}"/${PN}-8.7.55-make.patch
 	"${FILESDIR}"/${P}-fix-bashism-in-configure-script.patch
 )
 
diff --git a/sys-cluster/lmod/lmod-8.7.60.ebuild b/sys-cluster/lmod/lmod-8.7.60.ebuild
index 9baddb68a2db2..0ba5fa96d812d 100644
--- a/sys-cluster/lmod/lmod-8.7.60.ebuild
+++ b/sys-cluster/lmod/lmod-8.7.60.ebuild
@@ -47,7 +47,7 @@ BDEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.4.19-no-libsandbox.patch
-	"${FILESDIR}"/${PN}-8.6.14-r1-make.patch
+	"${FILESDIR}"/${PN}-8.7.55-make.patch
 )
 
 pkg_pretend() {
diff --git a/sys-cluster/lmod/lmod-9999.ebuild b/sys-cluster/lmod/lmod-9999.ebuild
index 9baddb68a2db2..0ba5fa96d812d 100644
--- a/sys-cluster/lmod/lmod-9999.ebuild
+++ b/sys-cluster/lmod/lmod-9999.ebuild
@@ -47,7 +47,7 @@ BDEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.4.19-no-libsandbox.patch
-	"${FILESDIR}"/${PN}-8.6.14-r1-make.patch
+	"${FILESDIR}"/${PN}-8.7.55-make.patch
 )
 
 pkg_pretend() {