diff --git a/include/mk/versions.mk b/include/mk/versions.mk
index bc26885..27f7f02 100644
--- a/include/mk/versions.mk
+++ b/include/mk/versions.mk
@@ -102,5 +102,5 @@ wireless_tools_version = 29
 wpa_supplicant_version = 2.9
 XML-Parser_version = 2.46
 xz_version = 5.2.6
-zsh_version = 5.8.1
+zsh_version = 5.9
 zstd_version = 1.5.2
diff --git a/toolchain/Makefile b/toolchain/Makefile
index 889660b..0685a24 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -24,6 +24,8 @@ subdirs += linux-headers
 subdirs += musl
 subdirs += gcc-pass2
 subdirs += pkg-config
+subdirs += autoconf
+subdirs += automake
 
 installdirs += $(tooldir) $(global_srcdir) $(global_objdir)
 
diff --git a/toolchain/autoconf/Makefile b/toolchain/autoconf/Makefile
new file mode 100644
index 0000000..2e9953a
--- /dev/null
+++ b/toolchain/autoconf/Makefile
@@ -0,0 +1,6 @@
+#  Makefile - hhl - /usr/src/world/autoconf
+#  Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
+#  
+distname      = autoconf
+include toolchain.mk
+include targets.mk
diff --git a/toolchain/automake/Makefile b/toolchain/automake/Makefile
new file mode 100644
index 0000000..197509f
--- /dev/null
+++ b/toolchain/automake/Makefile
@@ -0,0 +1,6 @@
+#  Makefile - hhl - /usr/src/world/automake
+#  Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
+#  
+distname      = automake
+include toolchain.mk
+include targets.mk
diff --git a/world/Makefile b/world/Makefile
index 72a2973..f76287b 100644
--- a/world/Makefile
+++ b/world/Makefile
@@ -32,8 +32,8 @@ subdirs += bison
 subdirs += flex
 subdirs += libtool
 subdirs += gdbm
-#subdirs += pcre
-#subdirs += zsh
+subdirs += pcre
+subdirs += zsh
 subdirs += inetutils
 subdirs += autoconf
 subdirs += automake
diff --git a/world/zsh/Makefile b/world/zsh/Makefile
index 9a5754d..0603680 100644
--- a/world/zsh/Makefile
+++ b/world/zsh/Makefile
@@ -2,6 +2,7 @@
 #  Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
 #
 distname      = zsh
+patches     += zsh-texi2html.patch
 include world.mk
 
 export CFLAGS = --sysroot=$(DESTDIR)
diff --git a/world/zsh/zsh-texi2html.patch b/world/zsh/zsh-texi2html.patch
new file mode 100644
index 0000000..07d2e96
--- /dev/null
+++ b/world/zsh/zsh-texi2html.patch
@@ -0,0 +1,15 @@
+diff -Naur zsh-5.9.orig/Doc/Makefile.in zsh-5.9/Doc/Makefile.in
+--- zsh-5.9.orig/Doc/Makefile.in	2022-05-08 02:18:22.000000000 -0400
++++ zsh-5.9/Doc/Makefile.in	2024-12-13 00:54:34.475621988 -0500
+@@ -173,9 +173,9 @@
+ html: zsh_toc.html
+ .PHONY: html
+ 
+-zsh_toc.html: $(sdir)/zsh.texi texi2html.conf
++zsh_toc.html: $(sdir)/zsh.texi
+ 	$(TEXI2HTML) --output . --ifinfo --split=chapter --node-files \
+-	             --init-file texi2html.conf $(sdir)/zsh.texi
++	             $(sdir)/zsh.texi
+ 
+ zshall.1: zsh.yo
+ 	case $@ in \