diff --git a/shells/zsh/stable/Makefile b/shells/zsh/stable/Makefile
index cf87676829b..9270f639798 100644
--- a/shells/zsh/stable/Makefile
+++ b/shells/zsh/stable/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2001/06/05 16:34:41 lebel Exp $
+# $OpenBSD: Makefile,v 1.5 2001/07/01 15:43:40 lebel Exp $
 
 COMMENT=	"the Z shell, Bourne shell-compatible, release flavor"
 COMMENT-zftp=	"the Z shell embedded ftp client"
 
-VERSION=	4.0.1
+VERSION=	4.0.2
 DISTNAME=	zsh-${VERSION}
 CATEGORIES=	shells
 NEED_VERSION=	1.402
diff --git a/shells/zsh/stable/files/md5 b/shells/zsh/stable/files/md5
index 362d94967b6..248c9745a79 100644
--- a/shells/zsh/stable/files/md5
+++ b/shells/zsh/stable/files/md5
@@ -1,3 +1,3 @@
-MD5 (zsh-4.0.1.tar.bz2) = ba2fb1bef2ed1522844b22bc9c14f916
-RMD160 (zsh-4.0.1.tar.bz2) = 7e40c4fd39fd747e11b8439230a0d6a86535a281
-SHA1 (zsh-4.0.1.tar.bz2) = f47c555f4d85745017869b15e22d64a67304a716
+MD5 (zsh-4.0.2.tar.bz2) = 11cfcd3ff0b53ced5b99cc7bd3dd7235
+RMD160 (zsh-4.0.2.tar.bz2) = f5977ec62dbd60190ad245b7ff839576d9241f00
+SHA1 (zsh-4.0.2.tar.bz2) = 067db91345d7a0a82dff10b7afdcdd43d3a99636
diff --git a/shells/zsh/stable/patches/patch-configure b/shells/zsh/stable/patches/patch-configure
deleted file mode 100644
index 289ee8ca846..00000000000
--- a/shells/zsh/stable/patches/patch-configure
+++ /dev/null
@@ -1,31 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2001/06/08 14:52:33 lebel Exp $
---- configure.orig	Tue Jun  5 18:51:53 2001
-+++ configure	Tue Jun  5 18:58:37 2001
-@@ -6767,8 +6767,16 @@ echo "$ac_t""$zsh_cv_sys_elf" 1>&6
-       ;;
-     esac
-   else
--    DLLD="${DLLD=ld}"
--    DLLDARG=""
-+    case "$host" in
-+      *openbsd*)
-+	DLLD="${DLLD=$CC}"
-+	DLLDARG="${LDARG}"
-+      ;;
-+      * )
-+	DLLD="${DLLD=ld}"
-+	DLLDARG=""
-+      ;;
-+    esac
-   fi
-   if test -n "$GCC"; then
-     DLCFLAGS="${DLCFLAGS=-fpic}"
-@@ -6787,7 +6795,7 @@ echo "$ac_t""$zsh_cv_sys_elf" 1>&6
-     netbsd*)      DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
-     aix*)         DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
-     solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
--    openbsd*)     DLLDFLAGS="${DLLDFLAGS=-Bshareable}" ;;
-+    openbsd*)     DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}" ;;
-   esac
-   case "$host" in
-     *-hpux*)  EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}" ;;
diff --git a/shells/zsh/stable/pkg/PLIST b/shells/zsh/stable/pkg/PLIST
index c650e2d144d..1ca7d3b124f 100644
--- a/shells/zsh/stable/pkg/PLIST
+++ b/shells/zsh/stable/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2001/06/05 16:34:43 lebel Exp $
+@comment $OpenBSD: PLIST,v 1.4 2001/07/01 15:43:42 lebel Exp $
 bin/zsh
 bin/zsh-${VERSION}
 @unexec install-info --delete --info-dir=%D/info %D/info/zsh.info
@@ -14,6 +14,7 @@ man/man1/zshcompwid.1
 man/man1/zshcontrib.1
 man/man1/zshexpn.1
 man/man1/zshmisc.1
+man/man1/zshmodules.1
 man/man1/zshoptions.1
 man/man1/zshparam.1
 man/man1/zshzle.1
@@ -32,6 +33,7 @@ share/zsh/${VERSION}/functions/_arg_compile
 share/zsh/${VERSION}/functions/_arguments
 share/zsh/${VERSION}/functions/_arp
 share/zsh/${VERSION}/functions/_arrays
+share/zsh/${VERSION}/functions/_autocd
 share/zsh/${VERSION}/functions/_autoload
 share/zsh/${VERSION}/functions/_bash_completions
 share/zsh/${VERSION}/functions/_bindkey
diff --git a/shells/zsh/stable/pkg/PLIST-zftp b/shells/zsh/stable/pkg/PLIST-zftp
index 89335820ef0..7a21af44548 100644
--- a/shells/zsh/stable/pkg/PLIST-zftp
+++ b/shells/zsh/stable/pkg/PLIST-zftp
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST-zftp,v 1.2 2001/06/05 16:34:43 lebel Exp $
-@comment $OpenBSD: PLIST-zftp,v 1.2 2001/06/05 16:34:43 lebel Exp $
+@comment $OpenBSD: PLIST-zftp,v 1.3 2001/07/01 15:43:42 lebel Exp $
 @pkgdep zsh-${VERSION}
 %%SHARED%%
 man/man1/zshzftpsys.1