diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 5d7fe55556d..117aaef45fa 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1999/10/07 19:52:34 brad Exp $
+# $OpenBSD: Makefile,v 1.8 1999/12/07 22:48:59 brad Exp $
 
 DISTNAME=       zsh-3.1.6
 CATEGORIES=	shells
@@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.zsh.org/zsh/ \
 		ftp://ftp.ips.oz.au/pub/packages/zsh/ \
 		ftp://ftp.uit.no/pub/unix/shells/zsh/
 
-MAINTAINER=	brad@openbsd.org
+MAINTAINER=	ports@openbsd.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-zsh-mem --enable-zsh-secure-free --enable-dynamic
@@ -23,10 +23,7 @@ PKGNAME= ${DISTNAME}-static
 .endif
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	@install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
-	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
+	@PKG_PREFIX="${PREFIX}" sh ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/shells/zsh-devel/patches/patch-aa b/shells/zsh-devel/patches/patch-aa
index 67f8f85ef5a..1b8daa8cb3c 100644
--- a/shells/zsh-devel/patches/patch-aa
+++ b/shells/zsh-devel/patches/patch-aa
@@ -1,15 +1,22 @@
 --- Doc/Makefile.in.orig	Tue Jul 20 08:10:07 1999
-+++ Doc/Makefile.in	Wed Aug  4 21:36:59 1999
-@@ -74,7 +74,8 @@
++++ Doc/Makefile.in	Tue Dec  7 16:51:36 1999
+@@ -37,7 +37,7 @@
+ 
+ @DEFS_MK@
+ 
+-MAKEINFO = makeinfo
++MAKEINFO = makeinfo --no-split
+ TEXI2DVI = texi2dvi
+ DVIPS = dvips -D 300
+ TEXI2HTML = texi2html -expandinfo -split_chapter
+@@ -74,6 +74,7 @@
  	$(TEXI2DVI) $(sdir)/zsh.texi
  
  zsh.info: zsh.texi
--	$(MAKEINFO) $(sdir)/zsh.texi; exit 0
 +	@rm -f zsh.info*
-+	$(MAKEINFO) --no-split $(sdir)/zsh.texi; exit 0
+ 	$(MAKEINFO) $(sdir)/zsh.texi; exit 0
  
  zsh.texi: zsh.yo
- 	$(YODL) -o $(sdir)/zsh.texi -I$(sdir) -w ztexi.yo version.yo zsh.yo
 @@ -157,10 +158,10 @@
  # ========== DEPENDENCIES FOR INSTALLING ==========
  
@@ -28,20 +35,17 @@
  install.info: zsh.info
  	$(sdir_top)/mkinstalldirs $(infodir)
 -	for file in zsh.info zsh.info-[1-9]*; do \
-+	for file in zsh.info*; do \
++	for file in zsh.info; do \
  	  if test -f $$file; then \
  	    $(INSTALL_DATA) $$file $(infodir); \
  	  elif test -f $(sdir)/$$file; then \
-@@ -185,9 +186,9 @@
+@@ -185,9 +186,6 @@
  	  else :; \
  	   fi || exit 1; \
  	done
 -	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
 -	  install-info --dir-file=$(infodir)/dir $(infodir)/zsh.info; \
 -	else true; fi
-+#	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-+#	  install-info --dir-file=$(infodir)/dir $(infodir)/zsh.info; \
-+#	else true; fi
  
  install.html: zsh_toc.html
  	$(sdir_top)/mkinstalldirs $(htmldir)
diff --git a/shells/zsh-devel/pkg/PLIST b/shells/zsh-devel/pkg/PLIST
index 9a77fe9c90e..879fd3e8c20 100644
--- a/shells/zsh-devel/pkg/PLIST
+++ b/shells/zsh-devel/pkg/PLIST
@@ -2,7 +2,6 @@ bin/zsh
 bin/zsh-3.1.6
 @unexec install-info --delete %D/info/zsh.info %D/info/dir
 info/zsh.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/zsh.info %D/info/dir
 man/man1/zshcompctl.1
 man/man1/zshexpn.1