diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 42a850b745e..6d290eaf935 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.37 2006/01/29 20:41:02 sturm Exp $
+# $OpenBSD: Makefile,v 1.38 2006/02/07 21:06:17 naddy Exp $
 
-COMMENT=	"Z shell, Bourne shell-compatible, release flavor"
+COMMENT=	"Z shell, Bourne shell-compatible"
 COMMENT-zftp=	"Z shell embedded ftp client"
 
 VERSION=	4.2.6
 DISTNAME=	zsh-${VERSION}
+PKGNAME=	${DISTNAME}p0
+PKGNAME-zftp=	zsh-zftp-${VERSION}
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.zsh.org/zsh/ \
 		${HOMEPAGE}pub/ \
@@ -24,35 +26,20 @@ 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 and vax
-FLAVOR?=        static
-.else
-FLAVOR?=
-.endif
+WANTLIB=	c m termcap 
 
 AUTOCONF_VERSION=2.59
-CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS=	--enable-zsh-mem --enable-zsh-secure-free \
+CONFIGURE_STYLE=autoconf
+CONFIGURE_ARGS=	${CONFIGURE_SHARED:S/shared/dynamic/} \
+		--enable-zsh-mem --enable-zsh-secure-free \
 		--enable-maildir-support --with-tcsetpgrp
 
-.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
+# we only enable sub-packages if shared libraries are available
+MULTI_PACKAGES= ${NO_SHARED_LIBS:S/Yes//:S/No/-zftp/}
 SUBPACKAGE?=
-.  for i in ${MULTI_PACKAGES}
-PKGNAME$i=	zsh$i-${VERSION:C/-//g}
-.  endfor
-.  if defined(PACKAGING) && !empty(SUBPACKAGE)
+
+.if defined(PACKAGING) && !empty(SUBPACKAGE)
 RUN_DEPENDS=	::shells/zsh
-.  endif
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED:S/shared/dynamic/}
-WANTLIB=	c m termcap 
 .endif
 
 SUBST_VARS=	VERSION
diff --git a/shells/zsh/pkg/DESCR b/shells/zsh/pkg/DESCR
index ec3923f29b0..8f4144f053e 100644
--- a/shells/zsh/pkg/DESCR
+++ b/shells/zsh/pkg/DESCR
@@ -4,6 +4,3 @@ compatible.  It includes enhancements of many types, notably in the
 command-line editor, options for customising its behaviour, filename
 globbing, features to make C-shell (csh) users feel more at home and
 extra features drawn from tcsh (another `custom' shell).
-
-Flavors:
-	static - Build with statically linked binaries.
diff --git a/shells/zsh/pkg/PFRAG.no-static b/shells/zsh/pkg/PFRAG.shared
similarity index 95%
rename from shells/zsh/pkg/PFRAG.no-static
rename to shells/zsh/pkg/PFRAG.shared
index 6eadce5e82c..9f31c0bfb5d 100644
--- a/shells/zsh/pkg/PFRAG.no-static
+++ b/shells/zsh/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.no-static,v 1.1 2004/07/12 19:46:52 lebel Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.3 2006/02/07 21:06:17 naddy 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/PLIST b/shells/zsh/pkg/PLIST
index 35daeb17c02..a6df2e88890 100644
--- a/shells/zsh/pkg/PLIST
+++ b/shells/zsh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.18 2006/01/29 20:41:02 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.19 2006/02/07 21:06:17 naddy Exp $
 @shell bin/zsh
 bin/zsh-${VERSION}
 @info info/zsh.info
@@ -539,4 +539,4 @@ share/zsh/${VERSION}/functions/zsh-mime-handler
 share/zsh/${VERSION}/functions/zsh-mime-setup
 share/zsh/${VERSION}/functions/zstyle+
 share/zsh/site-functions/
-!%%static%%
+%%SHARED%%