diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index a4dadb29add..907467e17fd 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,8 +1,64 @@
-# $OpenBSD: Makefile,v 1.29 2004/01/30 03:08:57 lebel Exp $
+# $OpenBSD: Makefile,v 1.30 2004/07/12 19:46:52 lebel Exp $
 
-    SUBDIR += stable
-    SUBDIR += stable,static
-#    SUBDIR += snapshot
-#    SUBDIR += snapshot,static
+COMMENT=	"Z shell, Bourne shell-compatible, release flavor"
+COMMENT-zftp=	"Z shell embedded ftp client"
 
-.include <bsd.port.subdir.mk>
+VERSION=	4.2.0
+PKGNAME=	zsh-${VERSION:C/-//g}
+DISTNAME=	zsh-${VERSION}
+CATEGORIES=	shells
+MASTER_SITES=	ftp://ftp.zsh.org/zsh/ \
+		http://www.zsh.org/pub/ \
+		ftp://ftp.sterling.com/zsh/ \
+		ftp://ftp.rge.com/pub/zsh/ \
+		ftp://ftp.cenatls.cena.dgac.fr/pub/shells/zsh/ \
+		ftp://mrrl.lut.ac.uk/zsh/ \
+		ftp://ftp.ips.oz.au/pub/packages/zsh/ \
+		ftp://ftp.uit.no/pub/unix/shells/zsh/
+
+HOMEPAGE=	http://www.zsh.org/
+
+MAINTAINER=	David Lebel <lebel@openbsd.org>
+
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+FLAVORS=	static
+
+.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Mvax}
+# for the time being, force static on alpha
+FLAVOR?=        static
+.else
+FLAVOR?=
+.endif
+
+AUTOCONF_VERSION=2.57
+CONFIGURE_STYLE= autoconf
+CONFIGURE_ARGS=	--enable-zsh-mem --enable-zsh-secure-free --enable-maildir-support
+
+.if ${FLAVOR:L} == "static"
+CONFIGURE_ENV=	LDFLAGS="-static"
+CONFIGURE_ARGS+=--disable-dynamic
+.else
+# we only enable sub-packages if the FLAVOR is not static
+MULTI_PACKAGES=	-zftp
+SUBPACKAGE?=
+.  for i in ${MULTI_PACKAGES}
+PKGNAME$i=	zsh$i-${VERSION:C/-//g}
+.  endfor
+.  if defined(PACKAGING) && !empty(SUBPACKAGE)
+RUN_DEPENDS=	::shells/zsh
+.  endif
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED:S/shared/dynamic/}
+.endif
+
+SUBST_VARS=	VERSION
+
+REGRESS_FLAGS=	INSTALL_PROGRAM="install -c -s -m 555" \
+	        INSTALL_DATA="install -c -m 444" \
+		INSTALL="install -c" \
+		TMPPREFIX=${WRKBUILD}/tmp
+	        
+.include <bsd.port.mk>
diff --git a/shells/zsh/stable/distinfo b/shells/zsh/distinfo
similarity index 100%
rename from shells/zsh/stable/distinfo
rename to shells/zsh/distinfo
diff --git a/shells/zsh/stable/patches/patch-Completion_BSD_Command__bsd_pkg b/shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg
similarity index 98%
rename from shells/zsh/stable/patches/patch-Completion_BSD_Command__bsd_pkg
rename to shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg
index 451798a0e08..528ac471a15 100644
--- a/shells/zsh/stable/patches/patch-Completion_BSD_Command__bsd_pkg
+++ b/shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.4 2003/07/03 12:56:52 lebel Exp $
+$OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.1 2004/07/12 19:46:52 lebel Exp $
 --- Completion/BSD/Command/_bsd_pkg.orig	Tue Oct 15 13:59:37 2002
 +++ Completion/BSD/Command/_bsd_pkg	Fri May 23 10:13:59 2003
 @@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
diff --git a/shells/zsh/stable/patches/patch-Completion_Unix_Command__find b/shells/zsh/patches/patch-Completion_Unix_Command__find
similarity index 97%
rename from shells/zsh/stable/patches/patch-Completion_Unix_Command__find
rename to shells/zsh/patches/patch-Completion_Unix_Command__find
index 1e21be310a3..740fdfbe603 100644
--- a/shells/zsh/stable/patches/patch-Completion_Unix_Command__find
+++ b/shells/zsh/patches/patch-Completion_Unix_Command__find
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Completion_Unix_Command__find,v 1.3 2003/07/03 12:56:52 lebel Exp $
+$OpenBSD: patch-Completion_Unix_Command__find,v 1.1 2004/07/12 19:46:52 lebel Exp $
 --- Completion/Unix/Command/_find.orig	Tue Dec 11 10:46:22 2001
 +++ Completion/Unix/Command/_find	Mon Jul  1 10:05:34 2002
 @@ -1,59 +1,39 @@
diff --git a/shells/zsh/stable/patches/patch-Doc_Makefile_in b/shells/zsh/patches/patch-Doc_Makefile_in
similarity index 93%
rename from shells/zsh/stable/patches/patch-Doc_Makefile_in
rename to shells/zsh/patches/patch-Doc_Makefile_in
index 6335179afc5..11dbeac33c0 100644
--- a/shells/zsh/stable/patches/patch-Doc_Makefile_in
+++ b/shells/zsh/patches/patch-Doc_Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Doc_Makefile_in,v 1.4 2003/07/03 12:56:52 lebel Exp $
+$OpenBSD: patch-Doc_Makefile_in,v 1.1 2004/07/12 19:46:52 lebel Exp $
 --- Doc/Makefile.in.orig	Thu Feb 13 06:06:46 2003
 +++ Doc/Makefile.in	Thu May 22 10:01:03 2003
 @@ -37,7 +37,7 @@ INSTALL         = @INSTALL@
diff --git a/shells/zsh/stable/patches/patch-Doc_zsh_texi b/shells/zsh/patches/patch-Doc_zsh_texi
similarity index 98%
rename from shells/zsh/stable/patches/patch-Doc_zsh_texi
rename to shells/zsh/patches/patch-Doc_zsh_texi
index 92b97fead6d..2f7b4ea3d04 100644
--- a/shells/zsh/stable/patches/patch-Doc_zsh_texi
+++ b/shells/zsh/patches/patch-Doc_zsh_texi
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Doc_zsh_texi,v 1.3 2003/07/03 12:56:52 lebel Exp $
+$OpenBSD: patch-Doc_zsh_texi,v 1.1 2004/07/12 19:46:52 lebel Exp $
 --- Doc/zsh.texi.orig	Tue May  6 11:50:40 2003
 +++ Doc/zsh.texi	Thu May 22 10:01:06 2003
 @@ -7,6 +7,10 @@
diff --git a/shells/zsh/stable/patches/patch-Makefile_in b/shells/zsh/patches/patch-Makefile_in
similarity index 89%
rename from shells/zsh/stable/patches/patch-Makefile_in
rename to shells/zsh/patches/patch-Makefile_in
index 772eb7520d0..fce69b0bc25 100644
--- a/shells/zsh/stable/patches/patch-Makefile_in
+++ b/shells/zsh/patches/patch-Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2003/07/03 12:56:52 lebel Exp $
+$OpenBSD: patch-Makefile_in,v 1.1 2004/07/12 19:46:52 lebel Exp $
 --- Makefile.in.orig	Mon Sep 10 06:48:44 2001
 +++ Makefile.in	Sun Nov 18 12:17:48 2001
 @@ -63,8 +63,8 @@ install-strip:
diff --git a/shells/zsh/stable/patches/patch-aczsh_m4 b/shells/zsh/patches/patch-aczsh_m4
similarity index 81%
rename from shells/zsh/stable/patches/patch-aczsh_m4
rename to shells/zsh/patches/patch-aczsh_m4
index 01f47116629..0ffb0820075 100644
--- a/shells/zsh/stable/patches/patch-aczsh_m4
+++ b/shells/zsh/patches/patch-aczsh_m4
@@ -1,4 +1,4 @@
-$OpenBSD: patch-aczsh_m4,v 1.2 2003/07/03 12:56:52 lebel Exp $
+$OpenBSD: patch-aczsh_m4,v 1.1 2004/07/12 19:46:52 lebel Exp $
 --- aczsh.m4.orig	Sun Apr 14 01:20:18 2002
 +++ aczsh.m4	Sun Apr 14 01:20:40 2002
 @@ -218,6 +218,8 @@ main()
diff --git a/shells/zsh/stable/pkg/DEINSTALL b/shells/zsh/pkg/DEINSTALL
similarity index 87%
rename from shells/zsh/stable/pkg/DEINSTALL
rename to shells/zsh/pkg/DEINSTALL
index a9a00c4ae19..4e2925c1bb1 100644
--- a/shells/zsh/stable/pkg/DEINSTALL
+++ b/shells/zsh/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2003/07/03 12:56:52 lebel Exp $
+# $OpenBSD: DEINSTALL,v 1.4 2004/07/12 19:46:52 lebel Exp $
 #
 # zsh de-installation
 
diff --git a/shells/zsh/stable/pkg/DESCR b/shells/zsh/pkg/DESCR
similarity index 100%
rename from shells/zsh/stable/pkg/DESCR
rename to shells/zsh/pkg/DESCR
diff --git a/shells/zsh/stable/pkg/DESCR-zftp b/shells/zsh/pkg/DESCR-zftp
similarity index 100%
rename from shells/zsh/stable/pkg/DESCR-zftp
rename to shells/zsh/pkg/DESCR-zftp
diff --git a/shells/zsh/stable/pkg/INSTALL b/shells/zsh/pkg/INSTALL
similarity index 94%
rename from shells/zsh/stable/pkg/INSTALL
rename to shells/zsh/pkg/INSTALL
index b1f32569f96..198ce2c800e 100644
--- a/shells/zsh/stable/pkg/INSTALL
+++ b/shells/zsh/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.2 2003/07/03 12:56:52 lebel Exp $
+# $OpenBSD: INSTALL,v 1.4 2004/07/12 19:46:52 lebel Exp $
 #
 # Pre/post-installation setup of zsh
 
diff --git a/shells/zsh/stable/pkg/PFRAG.no-static b/shells/zsh/pkg/PFRAG.no-static
similarity index 96%
rename from shells/zsh/stable/pkg/PFRAG.no-static
rename to shells/zsh/pkg/PFRAG.no-static
index 180d31244fd..6eadce5e82c 100644
--- a/shells/zsh/stable/pkg/PFRAG.no-static
+++ b/shells/zsh/pkg/PFRAG.no-static
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.no-static,v 1.5 2004/04/26 18:34:31 lebel Exp $
+@comment $OpenBSD: PFRAG.no-static,v 1.1 2004/07/12 19:46:52 lebel Exp $
 lib/zsh/${VERSION}/zsh/cap.so
 lib/zsh/${VERSION}/zsh/clone.so
 lib/zsh/${VERSION}/zsh/compctl.so
diff --git a/shells/zsh/pkg/PFRAG.shared b/shells/zsh/pkg/PFRAG.shared
new file mode 100644
index 00000000000..a8f8b191ac3
--- /dev/null
+++ b/shells/zsh/pkg/PFRAG.shared
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2004/07/12 19:46:52 lebel Exp $
+!%%static%%
diff --git a/shells/zsh/pkg/PFRAG.shared-zftp b/shells/zsh/pkg/PFRAG.shared-zftp
new file mode 100644
index 00000000000..1ed4ad7a2cb
--- /dev/null
+++ b/shells/zsh/pkg/PFRAG.shared-zftp
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared-zftp,v 1.1 2004/07/12 19:46:52 lebel Exp $
+lib/zsh/${VERSION}/zsh/zftp.so
diff --git a/shells/zsh/stable/pkg/PLIST b/shells/zsh/pkg/PLIST
similarity index 99%
rename from shells/zsh/stable/pkg/PLIST
rename to shells/zsh/pkg/PLIST
index e81b977dbc0..b40bdaa3cdf 100644
--- a/shells/zsh/stable/pkg/PLIST
+++ b/shells/zsh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2004/04/26 18:34:31 lebel Exp $
+@comment $OpenBSD: PLIST,v 1.12 2004/07/12 19:46:52 lebel Exp $
 bin/zsh
 bin/zsh-${VERSION}
 
diff --git a/shells/zsh/stable/pkg/PLIST-zftp b/shells/zsh/pkg/PLIST-zftp
similarity index 95%
rename from shells/zsh/stable/pkg/PLIST-zftp
rename to shells/zsh/pkg/PLIST-zftp
index c0abb6f77ee..7c7ca7d2ab2 100644
--- a/shells/zsh/stable/pkg/PLIST-zftp
+++ b/shells/zsh/pkg/PLIST-zftp
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-zftp,v 1.7 2004/04/26 18:34:31 lebel Exp $
+@comment $OpenBSD: PLIST-zftp,v 1.1 2004/07/12 19:46:52 lebel Exp $
 man/man1/zshzftpsys.1
 share/zsh/${VERSION}/functions/_zftp
 share/zsh/${VERSION}/functions/zfanon
diff --git a/shells/zsh/snapshot/Makefile b/shells/zsh/snapshot/Makefile
deleted file mode 100644
index 6d59054c579..00000000000
--- a/shells/zsh/snapshot/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $OpenBSD: Makefile,v 1.7 2004/01/29 16:39:11 lebel Exp $
-
-COMMENT=	"the Z shell, Bourne shell-compatible, development flavor"
-
-CATEGORIES=	shells
-
-HOMEPAGE=	http://www.zsh.org/
-
-MAINTAINER=	David Lebel <lebel@openbsd.org>
-
-PERMIT_PACKAGE_CDROM=	No
-PERMIT_PACKAGE_FTP=	No
-PERMIT_DISTFILES_CDROM=	No
-PERMIT_DISTFILES_FTP=	No
-
-IGNORE="There is currently no snapshot version of zsh.  Use zsh/stable"
-
-.include <bsd.port.mk>
diff --git a/shells/zsh/stable/Makefile b/shells/zsh/stable/Makefile
deleted file mode 100644
index c8308a91cf6..00000000000
--- a/shells/zsh/stable/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# $OpenBSD: Makefile,v 1.26 2004/05/14 18:59:18 lebel Exp $
-
-COMMENT=	"Z shell, Bourne shell-compatible, release flavor"
-COMMENT-zftp=	"Z shell embedded ftp client"
-
-VERSION=	4.2.0
-PKGNAME=	zsh-${VERSION:C/-//g}
-DISTNAME=	zsh-${VERSION}
-CATEGORIES=	shells
-MASTER_SITES=	ftp://ftp.zsh.org/zsh/ \
-		http://www.zsh.org/pub/ \
-		ftp://ftp.sterling.com/zsh/ \
-		ftp://ftp.rge.com/pub/zsh/ \
-		ftp://ftp.cenatls.cena.dgac.fr/pub/shells/zsh/ \
-		ftp://mrrl.lut.ac.uk/zsh/ \
-		ftp://ftp.ips.oz.au/pub/packages/zsh/ \
-		ftp://ftp.uit.no/pub/unix/shells/zsh/
-
-HOMEPAGE=	http://www.zsh.org/
-
-MAINTAINER=	David Lebel <lebel@openbsd.org>
-
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-
-FLAVORS=	static
-
-.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Mvax}
-# for the time being, force static on alpha
-FLAVOR?=        static
-.else
-FLAVOR?=
-.endif
-
-AUTOCONF_VERSION=2.57
-CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS=	--enable-zsh-mem --enable-zsh-secure-free --enable-maildir-support
-
-.if ${FLAVOR:L} == "static"
-CONFIGURE_ENV=	LDFLAGS="-static"
-CONFIGURE_ARGS+=--disable-dynamic
-.else
-# we only enable sub-packages if the FLAVOR is not static
-MULTI_PACKAGES=	-zftp
-SUBPACKAGE?=
-.  for i in ${MULTI_PACKAGES}
-PKGNAME$i=	zsh$i-${VERSION:C/-//g}
-.  endfor
-.  if defined(PACKAGING) && !empty(SUBPACKAGE)
-RUN_DEPENDS=	::shells/zsh/stable
-.  endif
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED:S/shared/dynamic/}
-.endif
-
-SUBST_VARS=	VERSION
-
-REGRESS_FLAGS=	INSTALL_PROGRAM="install -c -s -m 555" \
-	        INSTALL_DATA="install -c -m 444" \
-		INSTALL="install -c" \
-		TMPPREFIX=${WRKBUILD}/tmp
-	        
-.include <bsd.port.mk>
diff --git a/shells/zsh/stable/pkg/PFRAG.shared b/shells/zsh/stable/pkg/PFRAG.shared
deleted file mode 100644
index 86d207e1474..00000000000
--- a/shells/zsh/stable/pkg/PFRAG.shared
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2003/07/03 12:56:52 lebel Exp $
-!%%static%%
diff --git a/shells/zsh/stable/pkg/PFRAG.shared-zftp b/shells/zsh/stable/pkg/PFRAG.shared-zftp
deleted file mode 100644
index d4a576d272e..00000000000
--- a/shells/zsh/stable/pkg/PFRAG.shared-zftp
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-zftp,v 1.2 2003/07/03 12:56:52 lebel Exp $
-lib/zsh/${VERSION}/zsh/zftp.so