diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index c8e67df7dd9..5482173945e 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.14 2000/03/05 18:49:35 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2000/03/23 03:57:43 kevlo Exp $
 
-DISTNAME=	bash-2.03
+DISTNAME=	bash-2.04
 CATEGORIES=	shells
 NEED_VERSION=	1.218
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -10,7 +10,6 @@ DISTFILES=      ${DISTNAME}.tar.gz ${DOCNAME}.tar.gz
 
 MAINTAINER=	ports@openbsd.org
 
-LICENSE_TYPE=		GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -27,7 +26,7 @@ PKGNAME=	${DISTNAME}-static
 .endif
 
 post-install:
-	@mkdir -p ${PREFIX}/share/doc/bash
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bash
 	${INSTALL_MAN}  \
 		${WRKDIR}/doc/article.ps  \
 		${WRKDIR}/doc/article.txt  \
diff --git a/shells/bash2/files/md5 b/shells/bash2/files/md5
index cfa0f02a99c..439dd349755 100644
--- a/shells/bash2/files/md5
+++ b/shells/bash2/files/md5
@@ -1,6 +1,6 @@
-MD5 (bash-2.03.tar.gz) = 70e356eae4fed395c9a0fc35b752f711
-MD5 (bash-doc-2.03.tar.gz) = ede603422b9f6cf2ef70ee1a029987f0
-RMD160 (bash-2.03.tar.gz) = 75c0000765e5c61e51ed25f0076c3a66fc479713
-RMD160 (bash-doc-2.03.tar.gz) = 6b41d2f36331fbb6e006c2e14b70095e5b4cec6b
-SHA1 (bash-2.03.tar.gz) = b36bb517c51d5549a38a2835903f7e76d061830c
-SHA1 (bash-doc-2.03.tar.gz) = b06bee0e470738799cc74b525c3a7a5278acdd95
+MD5 (bash-2.04.tar.gz) = 49b548a8b72a4c925ff26930e4c31c6c
+MD5 (bash-doc-2.04.tar.gz) = a9684d1095e7ea1adb8759c3f4fca13d
+RMD160 (bash-2.04.tar.gz) = 649cb3ef660491aef9533410ed1f6d4ebfe347c7
+RMD160 (bash-doc-2.04.tar.gz) = 5dc68de33b9b8782a5501c9b95ddfa9d0bc2f821
+SHA1 (bash-2.04.tar.gz) = 83673721e946dafd5c83feeb032f41e413385ed7
+SHA1 (bash-doc-2.04.tar.gz) = 2adce48bfb828376baba5dd937fa74e3a5974bd3
diff --git a/shells/bash2/patches/patch-aa b/shells/bash2/patches/patch-aa
index 9d2f3040d64..689652ee75c 100644
--- a/shells/bash2/patches/patch-aa
+++ b/shells/bash2/patches/patch-aa
@@ -1,6 +1,6 @@
---- builtins/enable.def.orig	Wed Dec 16 08:45:56 1998
-+++ builtins/enable.def	Fri Feb 19 16:54:16 1999
-@@ -290,9 +290,10 @@
+--- builtins/enable.def.orig	Thu Mar 23 19:49:42 2000
++++ builtins/enable.def	Thu Mar 23 19:50:56 2000
+@@ -305,9 +305,10 @@
        name = list->word->word;
  
        size = strlen (name);
diff --git a/shells/bash2/patches/patch-ab b/shells/bash2/patches/patch-ab
index 5dc01eda822..38bdb33c0cc 100644
--- a/shells/bash2/patches/patch-ab
+++ b/shells/bash2/patches/patch-ab
@@ -1,10 +1,10 @@
---- configure.orig	Thu Feb 18 10:12:00 1999
-+++ configure	Fri Feb 19 16:54:18 1999
-@@ -734,6 +734,7 @@
- mips-irix6*)	opt_gnu_malloc=no ;;	# needs 8-byte alignment
- sparc-linux*)	opt_gnu_malloc=no ;;	# sparc running linux; requires ELF
- #*-freebsd*)	opt_gnu_malloc=no ;;	# they claim it's better
-+*-openbsd*)	opt_gnu_malloc=no ;;	# needs 8-byte alignment for one thing
- *-aix*)		opt_gnu_malloc=no ;;	# AIX machines
- *-nextstep*)	opt_gnu_malloc=no ;;	# NeXT machines running NeXTstep
- *-rhapsody*)	opt_gnu_malloc=no ;;	# Apple Rhapsody
+--- configure.orig	Thu Mar 23 19:51:31 2000
++++ configure	Thu Mar 23 19:52:44 2000
+@@ -762,6 +762,7 @@
+ m68k-sysv)	opt_bash_malloc=no ;;	# fixes file descriptor leak in closedir
+ sparc-linux*)	opt_bash_malloc=no ;;	# sparc running linux; requires ELF
+ #*-freebsd*)	opt_bash_malloc=no ;;	# they claim it's better
++*-openbsd*)    opt_gnu_malloc=no ;;    # needs 8-byte alignment for one thing
+ *-aix*)		opt_bash_malloc=no ;;	# AIX machines
+ *-nextstep*)	opt_bash_malloc=no ;;	# NeXT machines running NeXTstep
+ *-rhapsody*)	opt_bash_malloc=no ;;	# Apple Rhapsody