diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 938a5c47f2f..bae2613da03 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.55 2009/09/21 01:34:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.56 2009/11/02 18:12:29 naddy Exp $
 
 COMMENT=	GNU Bourne Again Shell
 
 DISTNAME=	bash-4.0
-PKGNAME=	${DISTNAME}.33p0
+PKGNAME=	${DISTNAME}.35
 CATEGORIES=	shells
 HOMEPAGE=	http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
 
@@ -19,7 +19,7 @@ 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 18 19 20 \
-          21 22 23 24 25 26 27 28 29 30 31 32 33
+          21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
 PATCHFILES+=	bash40-0$i:0
 .endfor
 
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index e3361ab2204..af3020a4a4b 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -32,6 +32,8 @@ MD5 (bash/bash40-030) = VcvcjlFz19Wb8RE8P/WQ3A==
 MD5 (bash/bash40-031) = OJY1KBEzQW3p0TKVJRyrxw==
 MD5 (bash/bash40-032) = 1kbLSu2ODw0dR+6i7V82kA==
 MD5 (bash/bash40-033) = 0+d9KgoFFHisqMMNE97YNA==
+MD5 (bash/bash40-034) = BaVIB/04jnG6yJEq1TCsbQ==
+MD5 (bash/bash40-035) = /D2P24PMxAerf20besaiIQ==
 RMD160 (bash/bash-4.0.tar.gz) = gquksstHXCAwkEqdIq9iCN+oXrM=
 RMD160 (bash/bash40-001) = uPHBAAtc0S7O554ppz89V20K02g=
 RMD160 (bash/bash40-002) = vTYYBrz+MkVwY467GhJ/GX1eN1Y=
@@ -66,6 +68,8 @@ RMD160 (bash/bash40-030) = PMxCvo8WuEzRj+6R/T3UaROj8LA=
 RMD160 (bash/bash40-031) = 1GnhDXnrNQSYWjCsEicMImKhoMk=
 RMD160 (bash/bash40-032) = aQwTMG5NxhZvhrpAgyO5LnC2AnY=
 RMD160 (bash/bash40-033) = L7LSSiN95a4QnnKeqUvuduaDD5w=
+RMD160 (bash/bash40-034) = 1t90dNGreZeRMwiDranwkMqx2Qg=
+RMD160 (bash/bash40-035) = +CzlnxE0NV15JIgB2Q+yyMESrZM=
 SHA1 (bash/bash-4.0.tar.gz) = K77TCHn59CTAkahGpIERwn0LI3A=
 SHA1 (bash/bash40-001) = 3EfVR77JOK/NezgoFv7IQHfzQS8=
 SHA1 (bash/bash40-002) = IdyUUSZUffA+N6O2jMS4C3iLnaY=
@@ -100,6 +104,8 @@ SHA1 (bash/bash40-030) = Fkej5hdBU3RfbPclwdM+I7RPizk=
 SHA1 (bash/bash40-031) = fzSHNUgBDnGDAVSVwbotQeYfIV4=
 SHA1 (bash/bash40-032) = +ElcfHsiAR0khk4MQl030/UTSwE=
 SHA1 (bash/bash40-033) = /XeJVtkxWkjw3dpo59gC5IwDmSE=
+SHA1 (bash/bash40-034) = 6p8y3pY+IaMkwk6cFjoLDjy/ll8=
+SHA1 (bash/bash40-035) = eeZpikArB0UNO5q2ZPPvWmxT2Fw=
 SHA256 (bash/bash-4.0.tar.gz) = l5PTlPZAqVAwx31ayYlySv4ZaSGVbbdBvK8UGAHFBRg=
 SHA256 (bash/bash40-001) = 47UUIE5dp78a7PfQmBUUsjZ9S1KdptSkXQncKeLwAxs=
 SHA256 (bash/bash40-002) = SVEX5WYBm5ywq0lQSUWzDN2m5bWVl+Q+GOrh8GsdXPQ=
@@ -134,6 +140,8 @@ SHA256 (bash/bash40-030) = f4XeaDmmGAkiwv7Ib0wVADb8oJbkOgRqEX6X5Q6VivM=
 SHA256 (bash/bash40-031) = YD8xiQbuTNX9xqMjYLWaW2S8tQ45P+d9YRYmm6KP+ww=
 SHA256 (bash/bash40-032) = 6mtHNr7c9zy/KiVYosOgTjsYBkqXMKx+DAPhXRA/qt4=
 SHA256 (bash/bash40-033) = xJb24DKZQJJdvfwALsCLiwbcfm4yacpJD5mjh50tBPU=
+SHA256 (bash/bash40-034) = N9LzBMXCg2Ar3oGVpQHBnvWt4/tUlNJcoi/h8Ay7Qvc=
+SHA256 (bash/bash40-035) = GAbk76m33Hls7ArMQGLNUBsmRlkWmcFLSJnCZDjI9nM=
 SIZE (bash/bash-4.0.tar.gz) = 6230779
 SIZE (bash/bash40-001) = 5156
 SIZE (bash/bash40-002) = 1220
@@ -168,3 +176,5 @@ SIZE (bash/bash40-030) = 1649
 SIZE (bash/bash40-031) = 1633
 SIZE (bash/bash40-032) = 1154
 SIZE (bash/bash40-033) = 1380
+SIZE (bash/bash40-034) = 2160
+SIZE (bash/bash40-035) = 1884
diff --git a/shells/bash/patches/patch-lib_glob_glob_c b/shells/bash/patches/patch-lib_glob_glob_c
index c72c4b9531b..fda5d79990e 100644
--- a/shells/bash/patches/patch-lib_glob_glob_c
+++ b/shells/bash/patches/patch-lib_glob_glob_c
@@ -1,7 +1,10 @@
-$OpenBSD: patch-lib_glob_glob_c,v 1.1 2009/08/02 15:32:01 naddy Exp $
---- lib/glob/glob.c.orig	Thu Jul 30 22:29:19 2009
-+++ lib/glob/glob.c	Thu Jul 30 22:30:07 2009
-@@ -1018,14 +1018,6 @@ glob_filename (pathname, flags)
+$OpenBSD: patch-lib_glob_glob_c,v 1.2 2009/11/02 18:12:29 naddy Exp $
+
+Nested comment.
+
+--- lib/glob/glob.c.orig	Mon Nov  2 13:27:53 2009
++++ lib/glob/glob.c	Mon Nov  2 13:27:53 2009
+@@ -1021,14 +1021,6 @@ glob_filename (pathname, flags)
        if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0')
  	{
  	  dflags |= GX_ALLDIRS|GX_ADDCURDIR;