diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 20cb20152e65..276c203e2937 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,123 +1,123 @@
 # New ports collection makefile for:    bash3
 # Date created:				30 Jul 2004
 # Whom:					Oliver Eikemeier
 #
 # $FreeBSD$
 #
 
 PORTNAME=		bash
 PORTVERSION=		3.0.${PATCHLEVEL}
-PORTREVISION=		0
+PORTREVISION=		1
 CATEGORIES=		shells
 MASTER_SITES=		${MASTER_SITE_GNU:S/$/:bash/} \
 			http://cnswww.cns.cwru.edu/~chet/%SUBDIR%/:faq \
 			ftp://ftp.cwru.edu/pub/%SUBDIR%/:bash,faq
 MASTER_SITE_SUBDIR=	${PORTNAME}/:bash,faq
 DISTNAME=		${PORTNAME}-${PORTVERSION:R}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}:bash
 DIST_SUBDIR=		${PORTNAME}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=		ftp://ftp.cwru.edu/pub/%SUBDIR%/:bash
 PATCH_SITE_SUBDIR=	${PORTNAME}/${DISTNAME}-patches/:bash
 .for patch in		01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16
 PATCHFILES+=		${PORTNAME}${PORTVERSION:R:S/.//g}-0${patch}:bash
 PATCHLEVEL=		${patch}
 .endfor
 
 MAINTAINER=		eik@FreeBSD.org
 COMMENT=		The GNU Project's Bourne Again SHell
 
 IGNOREFILES=		FAQ
 CONFLICTS=		bash-[0-24-9].*
 
 .if !defined(WITHOUT_IMPLICITCD)
 EXTRA_PATCHES+=		${PATCHDIR}/xpatch-implicitcd
 .endif
 
 .if !defined(WITHOUT_COLONBREAKSWORDS)
 EXTRA_PATCHES+=		${PATCHDIR}/xpatch-colonbreakswords
 .endif
 
 MAN1=			bash.1 bashbug.1
 INFO=			bash
 
 USE_REINPLACE=		yes
 GNU_CONFIGURE=		yes
 
 .if !defined(NOPORTDOCS)
 .if !defined(WITH_INCLUDED_FAQ)
 DISTFILES+=		FAQ:faq
 .endif
 PORTDOCS=		FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH
 .endif
 
 CONFIGURE_ARGS=		--without-bash-malloc \
 			--disable-rpath \
 			--enable-disabled-builtins
 
 .if defined(WITHOUT_HELP)
 CONFIGURE_ARGS+=	--disable-help-builtin
 PLIST_SUB+=		HELP="@comment "
 .elif defined(WITH_INTEGRATED_HELPFILES)
 PLIST_SUB+=		HELP="@comment "
 .else
 CONFIGURE_ARGS+=	--enable-separate-helpfiles
 PLIST_SUB+=		HELP=""
 .endif
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .else
 USE_GETTEXT=		yes
 PLIST_SUB+=		NLS=""
 .endif
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 CPPFLAGS+=		${PTHREAD_CFLAGS} \
 			-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" \
 			LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 600006
 CONFIGURE_ARGS+=	--with-installed-readline
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1
 
 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|"
 
 pre-build:
 	@${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build
 
 pre-install:
 	@${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \
 		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DESTDIR}${DOCSDIR}
 .if !defined(WITH_INCLUDED_FAQ)
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/FAQ \
 		${WRKSRC}/doc/INTRO ${DESTDIR}${DOCSDIR}
 .else
 	@${INSTALL_DATA} ${WRKSRC}/doc/FAQ \
 		${WRKSRC}/doc/INTRO ${DESTDIR}${DOCSDIR}
 .endif
 	@for d in ${PORTDOCS:NFAQ:NINTRO}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${d} ${DESTDIR}${DOCSDIR}; \
 	done
 .endif
 	@${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/shells/bash/files/patch-lib::readline::display.c b/shells/bash/files/patch-lib::readline::display.c
new file mode 100644
index 000000000000..269f52ee03d7
--- /dev/null
+++ b/shells/bash/files/patch-lib::readline::display.c
@@ -0,0 +1,24 @@
+#
+# Fix handling of `read -e' while PS1 is set longer than the screen width
+#
+# http://lists.gnu.org/archive/html/bug-bash/2004-11/msg00220.html
+# http://lists.gnu.org/archive/html/bug-bash/2004-11/msg00266.html
+#
+--- lib/readline/display.c.orig	2004-11-18 16:24:46.000000000 +0000
++++ lib/readline/display.c	2004-11-18 17:12:32.904903404 +0000
+@@ -572,11 +572,10 @@
+ 
+   /* inv_lbreaks[i] is where line i starts in the buffer. */
+   inv_lbreaks[newlines = 0] = 0;
+-#if 0
+-  lpos = out - wrap_offset;
+-#else
+-  lpos = prompt_physical_chars + modmark;
+-#endif
++  if (local_prompt)
++    lpos = prompt_physical_chars + modmark;
++  else
++    lpos = 0;
+ 
+ #if defined (HANDLE_MULTIBYTE)
+   memset (_rl_wrapped_line, 0, vis_lbsize);