diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index a56d6db9c752..61e2e3b0bcbf 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,135 +1,135 @@
 # Created by: Oliver Eikemeier
 
 PORTNAME=		bash
-PATCHLEVEL=		4
+PATCHLEVEL=		8
 PORTVERSION=		5.1.${PATCHLEVEL:S/^0//g}
-PORTREVISION?=		2
+PORTREVISION?=		0
 CATEGORIES=		shells
 MASTER_SITES=		GNU
 DISTNAME=		${PORTNAME}-${PORTVERSION:R}
 DIST_SUBDIR=		${PORTNAME}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=		GNU/${PORTNAME}/${DISTNAME}-patches/
 PATCHFILES!=		/usr/bin/jot -s " " -w \
 			${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \
 			${PATCHLEVEL} 1 ${PATCHLEVEL}
 
 MAINTAINER=		ehaupt@FreeBSD.org
 COMMENT=		GNU Project's Bourne Again SHell
 
 LICENSE=		GPLv3+
 LICENSE_FILE=		${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=		FDESCFS PORTS_READLINE HELP NLS STATIC SYSBASHRC \
 			SYSLOG DOCS
 FDESCFS_DESC=		Enable use of /dev/fd
 HELP_DESC=		Enable builtin help
 PORTS_READLINE_DESC=	libreadline from ports instead of bundled one
 SYSBASHRC_DESC=		Enable system-wide rc files
 
 OPTIONS_DEFAULT=	HELP PORTS_READLINE
 
 USES=			bison cpe iconv makeinfo pathfix localbase
 GNU_CONFIGURE=		yes
 OPTIONS_SUB=		yes
 CPE_VENDOR=		gnu
 
 FDESCFS_CONFIGURE_ENV_OFF=	bash_cv_dev_fd=absent
 FDESCFS_SUB_FILES=	pkg-message
 
 HELP_CONFIGURE_ENABLE=	help-builtin
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 PORTS_READLINE_CONFIGURE_WITH=	installed-readline
 PORTS_READLINE_USES=	readline
 
 INFO=			bash
 
 PORTDOCS=		FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH README \
 			bash.html bashref.html
 
 CONFIGURE_ARGS+=	--without-bash-malloc \
 			--disable-rpath \
 			--enable-disabled-builtins \
 			--with-libiconv-prefix=${ICONV_PREFIX}
 
 MAKE_ARGS+=	TERMCAP_LIB=-lncursesw
 
 .if empty(PKGNAMESUFFIX)
 CONFLICTS+=	bash-static-[0-9]*
 .else
 CONFLICTS+=	bash-[0-9]*
 .endif
 CONFLICTS+=	bashc
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:tl} != "no")
 CONFIGURE_ARGS+=	--enable-static-link
 LLD_UNSAFE=		yes
 .else
 CONFIGURE_ARGS+=	--disable-static-link
 # Bash symbols must be exported in order to link runtime plugins, i.e.,
 # "enable -f". (Plugins are not supported for bash-static.)
 LDFLAGS+=		-Wl,-export-dynamic
 .endif
 STANDARD_PATH=		/sbin:/bin:/usr/sbin:/usr/bin
 CPPFLAGS+=		-DDEFAULT_PATH_VALUE='\"${STANDARD_PATH}:${LOCALBASE}/sbin:${LOCALBASE}/bin\"' \
 			-DSTANDARD_UTILS_PATH='\"${STANDARD_PATH}\"'
 
 post-patch:
 # Ensure y.tab.c is regenerated
 	${TOUCH} ${WRKSRC}/parse.y
 	${RM} ${WRKSRC}/y.tab.c
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/doc/bash.1
 .if ${PORT_OPTIONS:MSYSLOG}
 	@${REINPLACE_CMD} \
 	    -e "s|/\*.*#define SYSLOG_HISTORY .*\*/|#define SYSLOG_HISTORY|g" \
 	    -e "s|/\*.*#define SYSLOG_SHOPT .*\*/|#define SYSLOG_SHOPT 1|g" \
 	    ${WRKSRC}/config-top.h
 .endif
 	@${REINPLACE_CMD} -e "s|\(/etc/profile\)|${LOCALBASE}\1|" \
 		${WRKSRC}/pathnames.h.in
 	@${REINPLACE_CMD} -e "s|/etc/[iI]nputrc|${LOCALBASE}/etc/inputrc|g" \
 		${WRKSRC}/doc/*.info ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.1 \
 		${WRKSRC}/lib/readline/rlconf.h
 
 post-patch-SYSBASHRC-on:
 	@${REINPLACE_CMD} \
 		-e "s|.*\(#define SYS_BASH.*\)\(/etc/.*\"\).*|\1${PREFIX}\2|" \
 		${WRKSRC}/config-top.h
 
 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|"
 
 pre-build:
 	@${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build
 
 post-install:
 	${LN} -sf bash ${STAGEDIR}${PREFIX}/bin/rbash
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/FAQ \
 		${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR}
 	for d in ${PORTDOCS:NFAQ:NINTRO:N*html}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${d} ${STAGEDIR}${DOCSDIR}; \
 	done
 
 regress: build
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test
 
 ckp:
 	${MAKE} -DPATCH_DEBUG clean patch
 
 # requires ftp/ncftp3
 cklatest:
 	@${ECHO} -n "Currently at: "
 	@${MAKE} -V PATCHLEVEL
 	-ncftpls \
 		${PATCH_SITES:Mftp*:Ox:[1]} \
-		| fgrep -v .sig | ${TAIL}
+		| fgrep -v .sig | ${SORT} | ${TAIL}
 
 .include <bsd.port.mk>
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 0eb703f1c071..6d63aaaef43d 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,11 +1,19 @@
-TIMESTAMP = 1608411498
+TIMESTAMP = 1620422724
 SHA256 (bash/bash-5.1.tar.gz) = cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa
 SIZE (bash/bash-5.1.tar.gz) = 10458638
 SHA256 (bash/bash51-001) = ebb07b3dbadd98598f078125d0ae0d699295978a5cdaef6282fe19adef45b5fa
 SIZE (bash/bash51-001) = 2894
 SHA256 (bash/bash51-002) = 15ea6121a801e48e658ceee712ea9b88d4ded022046a6147550790caf04f5dbe
 SIZE (bash/bash51-002) = 1575
 SHA256 (bash/bash51-003) = 22f2cc262f056b22966281babf4b0a2f84cb7dd2223422e5dcd013c3dcbab6b1
 SIZE (bash/bash51-003) = 1800
 SHA256 (bash/bash51-004) = 9aaeb65664ef0d28c0067e47ba5652b518298b3b92d33327d84b98b28d873c86
 SIZE (bash/bash51-004) = 3745
+SHA256 (bash/bash51-005) = cccbb5e9e6763915d232d29c713007a62b06e65126e3dd2d1128a0dc5ef46da5
+SIZE (bash/bash51-005) = 2577
+SHA256 (bash/bash51-006) = 75e17d937de862615c6375def40a7574462210dce88cf741f660e2cc29473d14
+SIZE (bash/bash51-006) = 1412
+SHA256 (bash/bash51-007) = acfcb8c7e9f73457c0fb12324afb613785e0c9cef3315c9bbab4be702f40393a
+SIZE (bash/bash51-007) = 2621
+SHA256 (bash/bash51-008) = f22cf3c51a28f084a25aef28950e8777489072628f972b12643b4534a17ed2d1
+SIZE (bash/bash51-008) = 1821