diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index f01129ec271..cef63bd2ff7 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.51 2009/05/06 15:21:58 naddy Exp $
+# $OpenBSD: Makefile,v 1.52 2009/05/19 15:33:31 naddy Exp $
 
 COMMENT=	GNU Bourne Again Shell
 
 DISTNAME=	bash-4.0
-PKGNAME=	${DISTNAME}.17
+PKGNAME=	${DISTNAME}.24
 CATEGORIES=	shells
 HOMEPAGE=	http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
 
@@ -18,7 +18,8 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/}
 MASTER_SITES0=	${MASTER_SITE_GNU:=bash/${DISTNAME}-patches/}
 DIST_SUBDIR=	bash
-.for i in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17
+.for i in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 \
+          21 22 23 24
 PATCHFILES+=	bash40-0$i:0
 .endfor
 
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index a360172b771..a29ce8ccb06 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -16,6 +16,13 @@ MD5 (bash/bash40-014) = hsrHjxkaMs0UBPESZOubKg==
 MD5 (bash/bash40-015) = u0GWPQMLxhog6BhTZ7M3xQ==
 MD5 (bash/bash40-016) = 91RVBIoIZSiXElL9l5uHVQ==
 MD5 (bash/bash40-017) = NLLNVycaRS9KJrOdd/+Qjw==
+MD5 (bash/bash40-018) = mTGO7Y3MBeEKFK4nBD8XXQ==
+MD5 (bash/bash40-019) = rzuarq3HGlAHvsK5jHUc3g==
+MD5 (bash/bash40-020) = 63x93rfoRR61kijcozKWlg==
+MD5 (bash/bash40-021) = WF1wG5eM62OWfcAg2zoiNA==
+MD5 (bash/bash40-022) = enDyYI+Q9qwMIFHl8cbEFA==
+MD5 (bash/bash40-023) = eiOqQWMN1P6NMBCKIA4tlg==
+MD5 (bash/bash40-024) = grpfyet4DrV9i3YooXt9dA==
 RMD160 (bash/bash-4.0.tar.gz) = gquksstHXCAwkEqdIq9iCN+oXrM=
 RMD160 (bash/bash40-001) = uPHBAAtc0S7O554ppz89V20K02g=
 RMD160 (bash/bash40-002) = vTYYBrz+MkVwY467GhJ/GX1eN1Y=
@@ -34,6 +41,13 @@ RMD160 (bash/bash40-014) = IyqnlVawVXryAN9n8ME1Q7SJj2o=
 RMD160 (bash/bash40-015) = dvvlXWIi79Wf4Otvnap7rfEB3aY=
 RMD160 (bash/bash40-016) = Grd0tLarCWTFPZpzWBCBsprqG6k=
 RMD160 (bash/bash40-017) = aS9bFTc1G2jA6a0KpZc0LNAesP0=
+RMD160 (bash/bash40-018) = vH0FbftmEFmJCrs06AxSBNv1EAA=
+RMD160 (bash/bash40-019) = AsEZ2uprLkFJB+PcOGvpB7METH0=
+RMD160 (bash/bash40-020) = h0o2gXHpznc6LxeoM5up5iLrg84=
+RMD160 (bash/bash40-021) = BXvsxwa5ClxV1RuqQl7pVG4/oJI=
+RMD160 (bash/bash40-022) = qcE0smDNS94dLDNStS3PXg8zNHY=
+RMD160 (bash/bash40-023) = 2/c+vptjrOthBoqfEzptSpRq95U=
+RMD160 (bash/bash40-024) = SExu9OC76Ifs/3VNsYqiXmIHVSk=
 SHA1 (bash/bash-4.0.tar.gz) = K77TCHn59CTAkahGpIERwn0LI3A=
 SHA1 (bash/bash40-001) = 3EfVR77JOK/NezgoFv7IQHfzQS8=
 SHA1 (bash/bash40-002) = IdyUUSZUffA+N6O2jMS4C3iLnaY=
@@ -52,6 +66,13 @@ SHA1 (bash/bash40-014) = jiraTEg60hm0eVMeVOKFV271xUc=
 SHA1 (bash/bash40-015) = Qaxdcpvbh1bE7lnifbHtotiP8NA=
 SHA1 (bash/bash40-016) = KrqRZN2m9ShyRhJ2+h7xdXhMVTU=
 SHA1 (bash/bash40-017) = soPQB5td+2ZESuGqla43/1gDaS0=
+SHA1 (bash/bash40-018) = ZTZxgktYv4FRiwQtsmHVysZpzi4=
+SHA1 (bash/bash40-019) = hG32nL713Tet3uvrFoFS/mvO6EU=
+SHA1 (bash/bash40-020) = i64wbPwNF29OvTz7vo0484rJ94c=
+SHA1 (bash/bash40-021) = oceFBC+SuFVk3rQdFCqU3QRbnaw=
+SHA1 (bash/bash40-022) = cGA0STGoZrB3VOsLnUkDnfQTIFM=
+SHA1 (bash/bash40-023) = 5szbwUX4EgnARUHL/La6Vh5/6Oo=
+SHA1 (bash/bash40-024) = NHHmgxZ5gNyyl76+F/NGRt9WDOY=
 SHA256 (bash/bash-4.0.tar.gz) = l5PTlPZAqVAwx31ayYlySv4ZaSGVbbdBvK8UGAHFBRg=
 SHA256 (bash/bash40-001) = 47UUIE5dp78a7PfQmBUUsjZ9S1KdptSkXQncKeLwAxs=
 SHA256 (bash/bash40-002) = SVEX5WYBm5ywq0lQSUWzDN2m5bWVl+Q+GOrh8GsdXPQ=
@@ -70,6 +91,13 @@ SHA256 (bash/bash40-014) = E+3ExpF2hnL2gLTyZr3RwS57JHNJ66TTDQvZI8yhw5o=
 SHA256 (bash/bash40-015) = e6Divt9UyAtY4PRx5zcsU55aQ9Ves/GIH1uPtkl1iBQ=
 SHA256 (bash/bash40-016) = jzqTbpKP54rhDfEJ0ib3kgelQYp+3tN26ID+V6Vx1Rk=
 SHA256 (bash/bash40-017) = K+4q/mM5sDTjqNiL+/ki9vRwSr8PtWBB+mkwdfUw8CE=
+SHA256 (bash/bash40-018) = HbO7jbDjhr6TjOPKnTr/EO3uV+aW3sNT+xNJYN3A5jE=
+SHA256 (bash/bash40-019) = UEmUjwdwkMAihkRaRBz476Oi2V1WYN2KzvUSQIsLdHU=
+SHA256 (bash/bash40-020) = HJqa6+MWhnxx/flPGy08K0DA0pGz0iDjZ4XhrDQMZ4Q=
+SHA256 (bash/bash40-021) = Akctb4sQSUGittTJrYI8sOfP5uXCDwsSqx1+sjyIEU0=
+SHA256 (bash/bash40-022) = BFodxxqhhj9zrXvgDsThjuPEPCD6/ljZ4sbFFZI1kBI=
+SHA256 (bash/bash40-023) = WAtSI3X3Yspd353ttkMe9Km26IfqJfwM4VLXR65d3IY=
+SHA256 (bash/bash40-024) = pZ66xH7+MblR4XMuQiPMclsnSMMxvsmCSDVcWsU3F6s=
 SIZE (bash/bash-4.0.tar.gz) = 6230779
 SIZE (bash/bash40-001) = 5156
 SIZE (bash/bash40-002) = 1220
@@ -88,3 +116,10 @@ SIZE (bash/bash40-014) = 3709
 SIZE (bash/bash40-015) = 1914
 SIZE (bash/bash40-016) = 3032
 SIZE (bash/bash40-017) = 1496
+SIZE (bash/bash40-018) = 2614
+SIZE (bash/bash40-019) = 3309
+SIZE (bash/bash40-020) = 2666
+SIZE (bash/bash40-021) = 1547
+SIZE (bash/bash40-022) = 1592
+SIZE (bash/bash40-023) = 2148
+SIZE (bash/bash40-024) = 3049