diff --git a/app-shells/zsh/additional-files/zshenv b/app-shells/zsh/additional-files/zshenv
index f56fbe639..9ec9c2b70 100644
--- a/app-shells/zsh/additional-files/zshenv
+++ b/app-shells/zsh/additional-files/zshenv
@@ -1,5 +1,5 @@
 setopt EXTENDED_GLOB
-if [ -z ~/.z(login|logout|profile|shrc|shenv)(N) ]; then
+if [[ -z ~/.z(login|logout|profile|shrc|shenv)(#qN) ]]; then
 	ZDOTDIR="$(finddir B_USER_SETTINGS_DIRECTORY)/zsh"
 fi
 unsetopt EXTENDED_GLOB
diff --git a/app-shells/zsh/patches/zsh-5.8.1.patchset b/app-shells/zsh/patches/zsh-5.8.1.patchset
index de9cea3cc..f59eab23c 100644
--- a/app-shells/zsh/patches/zsh-5.8.1.patchset
+++ b/app-shells/zsh/patches/zsh-5.8.1.patchset
@@ -1,4 +1,4 @@
-From 370db124e6c542236cde597cfda50d782656af7f Mon Sep 17 00:00:00 2001
+From d0043fb1261c576b96c1b1f8dd388c109b761ab1 Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Wed, 18 Sep 2013 03:11:28 -0600
 Subject: Fix for gcc2
@@ -102,10 +102,10 @@ index af8c5bb..fa01cc2 100644
  
  case $LIBS in
 -- 
-2.42.1
+2.45.2
 
 
-From 581791250b1ca0c0f6bf779feffe8f7f74033156 Mon Sep 17 00:00:00 2001
+From 2b723fc3ffccc4bb863b4bea290c1183a41b77cd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Wed, 11 Jan 2017 18:17:20 +0100
 Subject: Haiku rusage fix
@@ -125,10 +125,10 @@ index e743825..96837e9 100644
  	j->procs->ti.ru_maxrss / 1024 > reportmemory)
  	return 1;
 -- 
-2.42.1
+2.45.2
 
 
-From 16706ebf1de5aa55485ffed98baf070fb92efa3e Mon Sep 17 00:00:00 2001
+From b422a91aab7c273974a6d47333eb3ee9b3ecf268 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Thu, 17 Aug 2017 16:16:21 +0200
 Subject: Enable dynamic modules on Haiku
@@ -157,10 +157,10 @@ index fa01cc2..8119cc0 100644
        if test x$zsh_cv_sys_elf = xyes; then
  	DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}"
 -- 
-2.42.1
+2.45.2
 
 
-From 66308274f4327f0f5c2ba781d569e06d4fe41a47 Mon Sep 17 00:00:00 2001
+From 9734a2e9f9ba425602d0359aa73703cc5401222e Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Sat, 14 Apr 2018 18:11:49 +0000
 Subject: C89 fixes for gcc2 compatibility
@@ -247,10 +247,10 @@ index f5667f3..465048f 100644
  	int ignoredots = !isset(GLOBDOTS);
  	char *fname;
 -- 
-2.42.1
+2.45.2
 
 
-From 73396c1c6f6b6348caf5feb1e175c81cf93c7cef Mon Sep 17 00:00:00 2001
+From 4002381bd3b07582320a04f8fe79308673d994e6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Sat, 27 Oct 2018 10:36:50 +0200
 Subject: Some other function resides in libroot
@@ -274,10 +274,10 @@ index 8119cc0..c31387b 100644
  dnl Various features of ncurses depend on having the right header
  dnl (the system's own curses.h may well not be good enough).
 -- 
-2.42.1
+2.45.2
 
 
-From fa80aa8bbb19977151fad2b745714873eec01bc6 Mon Sep 17 00:00:00 2001
+From e13624f4db7dc0564be7aa820e5e8d5017165dcb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Mon, 18 Feb 2019 13:41:08 +0100
 Subject: Build fix for gcc2 from hanya
@@ -307,10 +307,10 @@ index b49ee9a..44313ba 100644
      /* Observer. = 2 degrees, Illuminant = D65 */
      double X = (R * 0.4124 + G * 0.3576 + B * 0.1805) / 95.047;
 -- 
-2.42.1
+2.45.2
 
 
-From f28915820baec904120b843a3138f35cc0e6fe92 Mon Sep 17 00:00:00 2001
+From 5e4f0702df349d4936f130afa0057a09db9f6a5c Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Sun, 13 Mar 2022 15:56:24 +0000
 Subject: zsh, fix for gcc2
@@ -337,10 +337,10 @@ index 96837e9..d830d39 100644
  	    if (setpgrp(0, 0) == 0) {
  		mypgrp = mypid;
 -- 
-2.42.1
+2.45.2
 
 
-From a4d0acb9cc97d23f7931ace95ac20ee1737b236d Mon Sep 17 00:00:00 2001
+From 5a1816383a1feab18d82398a8f42e0bc4aef52a5 Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Mon, 11 Dec 2023 18:27:05 -0700
 Subject: remove hd from hexdump completions
@@ -357,10 +357,10 @@ index f700ca6..6c0e0ba 100644
  local -a args fmts optpar
  fmts=(
 -- 
-2.42.1
+2.45.2
 
 
-From 5064c0bcabe0bb8f1188b7190a6ab08ffc073bf8 Mon Sep 17 00:00:00 2001
+From 64030ffdd7ef08a134f590f6dfe778c7b0415c48 Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Mon, 11 Dec 2023 18:27:51 -0700
 Subject: quick fixes for Haiku filesystem layout
@@ -407,5 +407,28 @@ index 4057fee..4df5155 100644
      for khostfile in $khostfiles; do
        if [[ -r $khostfile ]]; then
 -- 
-2.42.1
+2.45.2
+
+
+From 0611929d618d2b6f83f88de5a0d23908e8ac3168 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 3 Nov 2024 06:14:28 -0700
+Subject: quick fix for texinfo > 7
+
+
+diff --git a/Doc/Makefile.in b/Doc/Makefile.in
+index 5a6a705..1eada22 100644
+--- a/Doc/Makefile.in
++++ b/Doc/Makefile.in
+@@ -265,7 +265,7 @@ texi2html.conf: $(sdir_top)/Config/version.mk
+ 	d=`echo $(VERSION_DATE)`; \
+ 	v="<font size=\"-1\">Zsh version $(VERSION), released on $$d.</font>"; \
+ 	case '$(TEXI2HTML)' in \
+-	  *texi2any*) echo "set_from_init_file('PRE_BODY_CLOSE','$$v');" ;; \
++	  *texi2any*) echo "texinfo_set_from_init_file('PRE_BODY_CLOSE','$$v');" ;; \
+ 	  *) echo "\$$PRE_BODY_CLOSE = '$$v';" ;; \
+ 	esac > $@
+ 
+-- 
+2.45.2
 
diff --git a/app-shells/zsh/zsh-5.8.1.recipe b/app-shells/zsh/zsh-5.8.1.recipe
index 53f0f4639..5342ba271 100644
--- a/app-shells/zsh/zsh-5.8.1.recipe
+++ b/app-shells/zsh/zsh-5.8.1.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="https://www.zsh.org/"
 COPYRIGHT="1992-2020 The Zsh Development Group"
 LICENSE="ZSH
 	GNU GPL v2"
-REVISION="6"
+REVISION="7"
 SOURCE_URI="https://downloads.sf.net/zsh/zsh-$portVersion.tar.xz"
 CHECKSUM_SHA256="b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919"
 SOURCE_URI_2="https://downloads.sf.net/zsh/zsh-$portVersion-doc.tar.xz"