diff --git a/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile b/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile
index 2191b370bf3a..a16406adfa92 100644
--- a/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile
+++ b/external/bsd/nvi/docs/USD.doc/vi.ref/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2014/07/05 19:23:00 dholland Exp $
+#	$NetBSD: Makefile,v 1.5 2014/09/10 21:44:22 christos Exp $
 #
 #	@(#)Makefile	8.20 (Berkeley) 8/18/96
 
@@ -6,6 +6,8 @@ SECTION=	reference/ref1
 ARTICLE=	vi
 SRCS=		vi.ref
 DEPSRCS=	ex.cmd.roff set.opt.roff vi.cmd.roff ref.so index.so
+# Add -U to the macros if you want to build the index since it needs
+# unsafe mode for .sy
 MACROS=		-me
 ROFF_TBL=	yes
 CLEANFILES+=	index index.so
@@ -14,12 +16,12 @@ CLEANFILES+=	index index.so
 
 # index.so is generated.
 index.so: vi.ref
-	${TOOL_SOELIM} vi.ref | ${TOOL_TBL} | \
+	${TOOL_SOELIM} -I${.CURDIR} ${.ALLSRC} | ${TOOL_TBL} | \
 	    ${TOOL_ROFF_PS} ${MACROS} > /dev/null
 	sed -e 's/MINUSSIGN/\\-/' \
 	    -e 's/DOUBLEQUOTE/""/' \
 	    -e "s/SQUOTE/'/" \
 	    -e 's/ /__SPACE/g' < index | \
-	sort -u '-t	' +0 -1 +1n | awk -f merge.awk | \
+	sort -u '-t	' +0 -1 +1n | awk -f ${.CURDIR}/merge.awk | \
 	sed -e 's/__SPACE/ /g' > $@
 	rm -f index
diff --git a/external/bsd/nvi/docs/USD.doc/vi.ref/ref.so b/external/bsd/nvi/docs/USD.doc/vi.ref/ref.so
index b248b90ec6b3..466cda8c56f0 100644
--- a/external/bsd/nvi/docs/USD.doc/vi.ref/ref.so
+++ b/external/bsd/nvi/docs/USD.doc/vi.ref/ref.so
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ref.so,v 1.1 2013/11/22 16:00:45 christos Exp $
+.\"	$NetBSD: ref.so,v 1.2 2014/09/10 21:44:22 christos Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -62,7 +62,7 @@
 ..
 .\" key words for index
 .de KY
-.sy echo >>index '\\$1	\\n%'
+.if \n[.U]==0 .sy echo >>index '\\$1	\\n%'
 ..
 .\" option names
 .de OP
diff --git a/external/bsd/nvi/docs/USD.doc/vi.ref/vi.ref b/external/bsd/nvi/docs/USD.doc/vi.ref/vi.ref
index 333cbd927a6b..04a0c017a993 100644
--- a/external/bsd/nvi/docs/USD.doc/vi.ref/vi.ref
+++ b/external/bsd/nvi/docs/USD.doc/vi.ref/vi.ref
@@ -1,4 +1,4 @@
-.\"	$NetBSD: vi.ref,v 1.1 2013/11/22 16:00:45 christos Exp $
+.\"	$NetBSD: vi.ref,v 1.2 2014/09/10 21:44:22 christos Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -113,7 +113,7 @@ Engineers, Inc.
 The financial support of UUNET Communications Services is gratefully
 acknowledged.
 .)q
-.sy echo -n >index
+.if \n[.U]==0 .sy echo -n >index
 .oh 'Vi/Ex Reference''USD:13-%'
 .eh 'USD:13-%''Vi/Ex Reference'
 .bp 4