diff --git a/editors/nvi2/Makefile b/editors/nvi2/Makefile
index d9f955eb7d57..dfa27945a477 100644
--- a/editors/nvi2/Makefile
+++ b/editors/nvi2/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	nvi2
 PORTVERSION=	2.2.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	editors
 
 MAINTAINER=	leres@FreeBSD.org
 COMMENT=	Updated implementation of the ex/vi text editor
 WWW=		https://github.com/lichray/nvi2/
 
 LICENSE=	BSD3CLAUSE
 
 USES=		bdb cmake compiler:c11 ncurses
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	lichray
 
 CONFLICTS_INSTALL=	nvi-m17n nvi
 
 OPTIONS_DEFINE=		DEBUG WIDECHAR ICONV
 OPTIONS_DEFAULT=	WIDECHAR ICONV
 
 WIDECHAR_DESC=		Enable wide-character support (UTF-8)
 ICONV_DESC=		Enable iconv support
 
 DEBUG_CMAKE_BOOL=	ENABLE_DEBUG
 ICONV_CMAKE_BOOL=	ENABLE_ICONV
 ICONV_USES=		iconv
 WIDECHAR_CMAKE_BOOL=	ENABLE_WIDECHAR
 
 PLIST_FILES=	bin/nex \
 		bin/nvi \
 		bin/nview \
 		man/man1/nex.1.gz \
 		man/man1/nvi.1.gz \
 		man/man1/nview.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/nvi ${STAGEDIR}${PREFIX}/bin
 	${LN} ${STAGEDIR}${PREFIX}/bin/nvi ${STAGEDIR}${PREFIX}/bin/nex
 	${LN} ${STAGEDIR}${PREFIX}/bin/nvi ${STAGEDIR}${PREFIX}/bin/nview
 	${INSTALL_MAN} ${WRKSRC}/man/vi.1 \
 	    ${STAGEDIR}${MAN1PREFIX}/man/man1/nvi.1
 	${LN} -sf nvi.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/nex.1
 	${LN} -sf nvi.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/nview.1
 
 .include <bsd.port.mk>
diff --git a/editors/nvi2/files/patch-ex_ex__subst.c b/editors/nvi2/files/patch-ex_ex__subst.c
new file mode 100644
index 000000000000..6ff00423160c
--- /dev/null
+++ b/editors/nvi2/files/patch-ex_ex__subst.c
@@ -0,0 +1,12 @@
+--- ex/ex_subst.c.orig	2020-08-01 22:27:51 UTC
++++ ex/ex_subst.c
+@@ -1194,7 +1194,8 @@ re_tag_conv(SCR *sp, CHAR_T **ptrnp, size_t *plenp, in
+ 	for (; len > 0; --len) {
+ 		if (p[0] == '\\' && (p[1] == '/' || p[1] == '?')) {
+ 			++p;
+-			--len;
++			if (len > 1)
++				--len;
+ 		} else if (STRCHR(L("^.[]$*"), p[0]))
+ 			*t++ = '\\';
+ 		*t++ = *p++;