diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index 4f33421cebec..98c1e36eff3a 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -1,48 +1,48 @@
 # Created by: Mikolaj Golub <to.my.trociny@gmail.com>
 
 PORTNAME=	bmake
-PORTVERSION=	20210314
+PORTVERSION=	20210420
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg/
 
 MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	Portable version of NetBSD 'make' utility
 
 LICENSE=	BSD3CLAUSE
 
 PORTSCOUT=	skipv:200910007
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAKE_ENV+=	CONFIG_SITE=${CONFIG_SITE}
 
 .if defined(BATCH)
 EXTRA_PATCHES=	${FILESDIR}/extrapatch-unit-tests_Makefile
 .endif
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} 's/^\.Nx/NetBSD/' ${WRKDIR}/bmake/bmake.1
 
 do-build:
 	${SETENV} ${MAKE_ENV} ${SH} ${WRKDIR}/bmake/boot-strap \
 		--with-default-sys-path='.../share/mk:${PREFIX}/share/mk' \
 		-m ${WRKDIR}/mk objdir=${WRKDIR}/obj prefix=${PREFIX}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/obj/bmake ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/bmake/bmake.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${SH} ${WRKSRC}/mk/install-mk -v ${STAGEDIR}${PREFIX}/share/mk
 	${CHMOD} -x ${STAGEDIR}${PREFIX}/share/mk/meta2deps.py
 	cd ${STAGEDIR}${PREFIX} ;					\
 	    ${FIND} share/mk -type f -o -type l				\
 		| ${SORT}						\
 		>${WRKDIR}/PLIST.share-mk
 	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.share-mk"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "r ${WRKDIR}/PLIST.share-mk"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-mk
 	cd ${WRKDIR} ; ex < ex.script
 
 .include <bsd.port.mk>
diff --git a/devel/bmake/distinfo b/devel/bmake/distinfo
index 5ef307f001d9..71f6f55be292 100644
--- a/devel/bmake/distinfo
+++ b/devel/bmake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618160683
-SHA256 (bmake-20210314.tar.gz) = dabb91a36701141057b12b0d3f24e1ec1eaee3eb149303a7dac662e15837ea5c
-SIZE (bmake-20210314.tar.gz) = 749343
+TIMESTAMP = 1619943336
+SHA256 (bmake-20210420.tar.gz) = 47e551293843d504fe4197413aa6d7ee003090669ac200932ff40e9ccb4658aa
+SIZE (bmake-20210420.tar.gz) = 755281