diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index d151f9f3de7..b833e03863a 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.65 2011/03/02 20:55:23 naddy Exp $
+# $OpenBSD: Makefile,v 1.66 2011/03/15 19:22:08 naddy Exp $
 
 COMMENT=	GNU Bourne Again Shell
 
-REVISION =	0
-DISTNAME=	bash-4.1
-PKGNAME=	${DISTNAME}.9
+DISTNAME=	bash-4.2
+PKGNAME=	${DISTNAME}.8
 CATEGORIES=	shells
 HOMEPAGE=	http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
 
@@ -19,8 +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
-PATCHFILES+=	bash41-0$i:0
+.for i in 01 02 03 04 05 06 07 08
+PATCHFILES+=	bash42-0$i:0
 .endfor
 
 MODULES=	devel/gettext
@@ -28,8 +27,8 @@ USE_GROFF =	Yes
 WANTLIB=	c termcap 
 
 # enable if parse.y is patched
-#BUILD_DEPENDS=	devel/bison
-#YACC=		${LOCALBASE}/bin/bison -y
+BUILD_DEPENDS=	devel/bison
+YACC=		${LOCALBASE}/bin/bison -y
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${NO_SHARED_LIBS:S/Yes/--enable-static-link/:S/No//}
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 5ccaf4eb995..62bc3ac763d 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,50 +1,45 @@
-MD5 (bash/bash-4.1.tar.gz) = mADYckgV/YSZTZvmWrXnuA==
-MD5 (bash/bash41-001) = WC3qVnG1V/eD4YYpwvd7aA==
-MD5 (bash/bash41-002) = EY1GUJXUpHBusdNGlqJmag==
-MD5 (bash/bash41-003) = Eg988DmkDTX+N15Z1vF63A==
-MD5 (bash/bash41-004) = M27gN/wsweI1CwUJf73IfA==
-MD5 (bash/bash41-005) = lHHmZnl/CwPrIXXtdSqVUA==
-MD5 (bash/bash41-006) = +4DM1Yyx40lA8630zm5KHg==
-MD5 (bash/bash41-007) = GSqLFh1Bmh0NIRFp8dEEbg==
-MD5 (bash/bash41-008) = HcWgJTgn3svmqlKc3oPhVA==
-MD5 (bash/bash41-009) = 6jYbhCt0Baf167q733Q3Lw==
-RMD160 (bash/bash-4.1.tar.gz) = VUx+y0pj2kMXaMrtH5WMBrj6cgc=
-RMD160 (bash/bash41-001) = IHMPiTtmYaa7ABAlSBVsPLBZ9rw=
-RMD160 (bash/bash41-002) = GleUgfgZU+fx3t4KrxoD5KrSmq8=
-RMD160 (bash/bash41-003) = 4mf3lsP0tEbDZVPb4lT4SVc7PyQ=
-RMD160 (bash/bash41-004) = uBZ7S3/icsynQcXnrWe5uwaOaQ4=
-RMD160 (bash/bash41-005) = mhDHH5LEEHo4Ifjityppxi+q3BQ=
-RMD160 (bash/bash41-006) = HQa7krhya/F9LmrrQ+lzf67506Y=
-RMD160 (bash/bash41-007) = bWLQ49WWrQMc1fOG8+nC3JB2KD8=
-RMD160 (bash/bash41-008) = ZbL5Hecwyau5dJwFDnacbB+7M7A=
-RMD160 (bash/bash41-009) = 6B1ODiXmRZGrG9phuADnaCANngU=
-SHA1 (bash/bash-4.1.tar.gz) = O9HsnGbzaJ9rNJW9qvkHey5dwVA=
-SHA1 (bash/bash41-001) = QeF2+d50nkMr67j6xdAzo5NgRfY=
-SHA1 (bash/bash41-002) = cqmtLgjTXgKsFBfzrt8520y0xm8=
-SHA1 (bash/bash41-003) = Ma5/UR2Z6jNroimcEOSTwhUS460=
-SHA1 (bash/bash41-004) = Rp3/aXt6wcFX3MYl2TM6Hc24iuI=
-SHA1 (bash/bash41-005) = yEALfT3bL4xxWbu9I4si/BBQThI=
-SHA1 (bash/bash41-006) = lwf8apLU3pBwFlhAdBh8GqyiXyo=
-SHA1 (bash/bash41-007) = YU5GEo1vmGcTKzF2X2ClFLOVrkM=
-SHA1 (bash/bash41-008) = 9OYY5NTAGytXzckz5kjyf4KwFXo=
-SHA1 (bash/bash41-009) = 2HT2FnQUQGCneIZl8VMf4hFnx8I=
-SHA256 (bash/bash-4.1.tar.gz) = P2JxJKg8bTTbUDqSPiBxDTcFc6Kd1dEdbxFtGu574do=
-SHA256 (bash/bash41-001) = puR/oQj4U9DwmZUgUJwRaA03yLeCO5K5bUMXZt1iAng=
-SHA256 (bash/bash41-002) = Mi4ineGGs72H3tq/utg4ZxbxA+h/8AzRstuETg3/ePg=
-SHA256 (bash/bash41-003) = kXY93bu5jD/33rP66js61uhh57/S5GwEXA0dhdGzJW0=
-SHA256 (bash/bash41-004) = eMBjujTB85Clvy5XJ2JMouJTu+9Jzhh8q7JA7uf0/54=
-SHA256 (bash/bash41-005) = UZY52NFmS+dNfsFYedFjN/6Mca+NZIsC+EzN1PtznBo=
-SHA256 (bash/bash41-006) = WYarzzPAsIe9VnDxrmpkAKjOarfnxN4YuYJtDuEPLEk=
-SHA256 (bash/bash41-007) = dAEqLCi6T7Uyw+tpFVrIcKrI1TmQ+k4eUs3Bc9TCBac=
-SHA256 (bash/bash41-008) = TiwsJRQyzfa4TdW0/QbWmPTb6rtWpsJHyovxhENIEhU=
-SHA256 (bash/bash41-009) = vUAGlkroil7YAywWIIEwCE79Q4Zq/hm7iKFn4MDxVtE=
-SIZE (bash/bash-4.1.tar.gz) = 6598300
-SIZE (bash/bash41-001) = 1445
-SIZE (bash/bash41-002) = 1799
-SIZE (bash/bash41-003) = 1407
-SIZE (bash/bash41-004) = 1705
-SIZE (bash/bash41-005) = 1626
-SIZE (bash/bash41-006) = 2166
-SIZE (bash/bash41-007) = 1610
-SIZE (bash/bash41-008) = 1610
-SIZE (bash/bash41-009) = 1323
+MD5 (bash/bash-4.2.tar.gz) = P7knx8MwIvHDJ/FKgcDUsA==
+MD5 (bash/bash42-001) = EQC8Hdos3AasRNfl0Xhkow==
+MD5 (bash/bash42-002) = MOeUgHmSHTJh78xqQHIhNQ==
+MD5 (bash/bash42-003) = nqBt7OxDoZjz188prMYC+A==
+MD5 (bash/bash42-004) = +0j2E017ATE1kpR2qgwlDA==
+MD5 (bash/bash42-005) = 5w5F3jNCazgVOzkL4Nu81A==
+MD5 (bash/bash42-006) = zk5cSEmTcFsn2qFR7KJCwg==
+MD5 (bash/bash42-007) = iNH5bbKUYXZ2AuJUaAO9pw==
+MD5 (bash/bash42-008) = JMV0v21qWB4wCCPZwSdq9g==
+RMD160 (bash/bash-4.2.tar.gz) = 33rlF4PwOaEjTTtyD/z0v6XQlnM=
+RMD160 (bash/bash42-001) = HmQyECzA8N0d0KIH5KiStPE8ALA=
+RMD160 (bash/bash42-002) = gzVErWWGsOzlOIHMhQ/0SOxWPLs=
+RMD160 (bash/bash42-003) = n25WCYSZe1laCm2F91HBuBUDAPA=
+RMD160 (bash/bash42-004) = Xbp/1cb9+mS/miaWplaYSC1+e90=
+RMD160 (bash/bash42-005) = CVcvOXG+qqqb4b3l+efTpuVuUVk=
+RMD160 (bash/bash42-006) = kqTD62Ev4edKbe02I9H72DIv6EM=
+RMD160 (bash/bash42-007) = cyhbYdJaf5mNUpZdBhXN1UclJSc=
+RMD160 (bash/bash42-008) = Rc6INMHKb42/wlUf0ZBnwdQl4Bs=
+SHA1 (bash/bash-4.2.tar.gz) = SHhAq3E063kB+7Lkmw7j0i3hXLg=
+SHA1 (bash/bash42-001) = wGnwdJLJGZvHz/caTwMvZouk6go=
+SHA1 (bash/bash42-002) = dbZyZlagjkcXJwRUXFeikOKQdek=
+SHA1 (bash/bash42-003) = wYOQ7cyHw0fK3mfZwWU/HyIM5k0=
+SHA1 (bash/bash42-004) = 4Q8OjTwkwQ7/+8pGBay5Zjk5Af8=
+SHA1 (bash/bash42-005) = wd0y+aq5Y4MMub9cCXPu+k1/iIE=
+SHA1 (bash/bash42-006) = SuKLR6RoUNs6WTb/D6+5BW8VMp8=
+SHA1 (bash/bash42-007) = Mc8Dc7HU1hVAR0tvUnv3Z16Hc/M=
+SHA1 (bash/bash42-008) = fwlhqvKEs26sFQOCTNnoWSZigSA=
+SHA256 (bash/bash-4.2.tar.gz) = onoReeycCDDGXGql19q2D3zhoqYIYYVw+Wv6culas9g=
+SHA256 (bash/bash42-001) = jWygKFdsSvI+ZgovvCESIhoRyKeFwLN/Azln5c0StHo=
+SHA256 (bash/bash42-002) = /rrJJ+GZrO66IASQjZcdSvtJtSF5bD9C0RZvn7v7zvk=
+SHA256 (bash/bash42-003) = Wgp8FQGMhzSOqHywvuoUNF+vh427DiXBf6cGdxlMtM0=
+SHA256 (bash/bash42-004) = TjSw+DDSWD1W4UIlpmk3q8gfRbuvzS60na9hyUYhQME=
+SHA256 (bash/bash42-005) = qBdJ5zAEuBz98P4HW+w2XcH+91buXj/RQoIeMX0UWaA=
+SHA256 (bash/bash42-006) = yRFIlFot2vp5JoLXyGaMWefmRerhM0sVsNXZrSJjS9E=
+SHA256 (bash/bash42-007) = QFgmrPRD3RCE8jahXLdtfw7i2+Xt/0XF+4NttXH7fpU=
+SHA256 (bash/bash42-008) = IwgNEaYKeJQSEOJHf2vKBmtF2wPe+mDahv12UQe6JDc=
+SIZE (bash/bash-4.2.tar.gz) = 7009201
+SIZE (bash/bash42-001) = 2944
+SIZE (bash/bash42-002) = 1780
+SIZE (bash/bash42-003) = 6896
+SIZE (bash/bash42-004) = 1686
+SIZE (bash/bash42-005) = 3424
+SIZE (bash/bash42-006) = 1187
+SIZE (bash/bash42-007) = 1394
+SIZE (bash/bash42-008) = 2164
diff --git a/shells/bash/patches/patch-Makefile_in b/shells/bash/patches/patch-Makefile_in
index 0439f85393c..65a39697fae 100644
--- a/shells/bash/patches/patch-Makefile_in
+++ b/shells/bash/patches/patch-Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2010/03/21 16:37:49 naddy Exp $
---- Makefile.in.orig	Wed Dec 30 19:05:40 2009
-+++ Makefile.in	Mon Feb  8 21:15:32 2010
-@@ -341,7 +341,7 @@ INTL_LIBDIR = $(dot)/$(LIBSUBDIR)/intl
+$OpenBSD: patch-Makefile_in,v 1.3 2011/03/15 19:22:08 naddy Exp $
+--- Makefile.in.orig	Wed Dec  1 01:22:42 2010
++++ Makefile.in	Tue Mar 15 18:57:29 2011
+@@ -344,7 +344,7 @@ INTL_LIBDIR = $(dot)/$(LIBSUBDIR)/intl
  INTL_ABSSRC = ${topdir}/$(INTL_LIB)
  INTL_BUILDDIR = ${LIBBUILD}/intl
  
diff --git a/shells/bash/pkg/PLIST b/shells/bash/pkg/PLIST
index 0ee20d56250..5782031b873 100644
--- a/shells/bash/pkg/PLIST
+++ b/shells/bash/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.14 2010/03/21 16:37:49 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.15 2011/03/15 19:22:08 naddy Exp $
 @pkgpath shells/bash,static
 @shell bin/bash
 bin/bashbug
@@ -34,5 +34,7 @@ share/locale/ru/LC_MESSAGES/bash.mo
 share/locale/sk/LC_MESSAGES/bash.mo
 share/locale/sv/LC_MESSAGES/bash.mo
 share/locale/tr/LC_MESSAGES/bash.mo
+share/locale/uk/LC_MESSAGES/bash.mo
 share/locale/vi/LC_MESSAGES/bash.mo
+share/locale/zh_CN/LC_MESSAGES/bash.mo
 share/locale/zh_TW/LC_MESSAGES/bash.mo