diff --git a/shells/Makefile b/shells/Makefile
index 7e459d8b090..6f8b4bb921b 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,13 +1,18 @@
-# $OpenBSD: Makefile,v 1.6 1999/08/21 14:01:49 brad Exp $
+# $OpenBSD: Makefile,v 1.7 2000/03/31 16:31:07 espie Exp $
 # $FreeBSD: Makefile,v 1.13 1997/01/03 00:40:55 max Exp $
 #
 
     SUBDIR += bash
+    SUBDIR += bash:static
     SUBDIR += bash2
+    SUBDIR += bash2:static
     SUBDIR += es
     SUBDIR += scsh
     SUBDIR += tcsh
+    SUBDIR += tcsh:static
     SUBDIR += zsh
+    SUBDIR += zsh:static
     SUBDIR += zsh-devel
+    SUBDIR += zsh-devel:static
 
 .include <bsd.port.subdir.mk>
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 68c9ff897cc..fcfdce70f0d 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2000/03/26 00:12:27 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2000/03/31 16:31:07 espie Exp $
 
 DISTNAME=	bash-1.14.7
 CATEGORIES=	shells
-NEED_VERSION=	1.234
+NEED_VERSION=	1.240
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= bash
 
@@ -14,10 +14,14 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-# invoke make with STATIC=yes to build a static binary
+FLAVORS=static
 .if defined(STATIC) && ${STATIC:U} == YES
+FLAVOR=static
+.endif
+FLAVOR?=
+
+.if ${FLAVOR:L} == "static"
 MAKE_ENV=	CPP_DEFINES="-DSYSDEP_LDFLAGS=-static"
-PKGNAME=        ${DISTNAME}-static
 .endif
 
 FAKE=		Yes
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 02e5a3dc44c..99a37147033 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,13 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2000/03/06 03:00:04 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2000/03/31 16:31:07 espie Exp $
 
 DISTNAME=	tcsh-6.09
-.if defined(STATIC) && ${STATIC:U} == YES
-PKGNAME=	tcsh-6.09.00-static
-.else
 PKGNAME=	tcsh-6.09.00
-.endif
 CATEGORIES=	shells
-NEED_VERSION=	1.218
+NEED_VERSION=	1.240
 MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/
 
 MAINTAINER=	brad@openbsd.org
@@ -20,8 +16,13 @@ PERMIT_DISTFILES_FTP=	Yes
 
 GNU_CONFIGURE=	Yes
 
-# invoke make with STATIC=yes to build a static binary
+FLAVORS=static
 .if defined(STATIC) && ${STATIC:U} == YES
+FLAVOR=static
+.endif
+FLAVOR?=
+
+.if ${FLAVOR:L} == "static"
 CONFIGURE_ENV+=	LDFLAGS=-static
 .endif
 
diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 87bceb0a467..9671ef2a62c 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2000/03/26 02:00:17 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2000/03/31 16:31:08 espie Exp $
 
 DISTNAME=       zsh-3.1.6
 CATEGORIES=	shells
-NEED_VERSION=	1.233
+NEED_VERSION=	1.240
 MASTER_SITES=	ftp://ftp.zsh.org/zsh/ \
 		ftp://ftp.sterling.com/zsh/ \
 		ftp://ftp.rge.com/pub/zsh/ \
@@ -30,10 +30,14 @@ FAKE=		Yes
 post-configure:
 	@perl -pi.bak -e 's,/usr/local,\$${DESTDIR}/usr/local,' ${WRKBUILD}/Makefile
 
-# invoke make with STATIC=yes to build a static binary
+FLAVORS=static
 .if defined(STATIC) && ${STATIC:U} == YES
+FLAVOR=static
+.endif
+FLAVOR?=
+
+.if ${FLAVOR:L} == "static"
 CONFIGURE_ENV+=	LDFLAGS=-static
-PKGNAME=	${DISTNAME}-static
 .endif
 
 
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 457f7378cf2..2bc339d8e8f 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.18 2000/03/06 17:57:23 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2000/03/31 16:31:08 espie Exp $
 
 DISTNAME=	zsh-3.0.7
 CATEGORIES=	shells
+NEED_VERSION=	1.240
 MASTER_SITES=	ftp://ftp.zsh.org/zsh/ \
 		ftp://ftp.sterling.com/zsh/ \
 		ftp://ftp.rge.com/pub/zsh/ \
@@ -24,14 +25,14 @@ HAS_CONFIGURE=		Yes
 CONFIGURE_ARGS= --prefix='$${DESTDIR}${PREFIX}' --sysconfdir='$${DESTDIR}/etc'
 CONFIGURE_ARGS+=	--enable-zsh-mem --enable-zsh-secure-free
 
-# invoke make with STATIC=yes to build a static binary
+FLAVORS=static
 .if defined(STATIC) && ${STATIC:U} == YES
+FLAVOR=static
+.endif
+FLAVOR?=
+
+.if ${FLAVOR:L} == "static"
 CONFIGURE_ENV+=	LDFLAGS=-static
-PKGNAME=	${DISTNAME}-static
 .endif
 
-post-install:
-	@install-info ${PREFIX}/info/zsh.info ${PREFIX}/info/dir
-#	@PKG_PREFIX="${PREFIX}" sh ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
-
 .include <bsd.port.mk>