diff --git a/share/doc/usd/10.exref/Makefile b/share/doc/usd/10.exref/Makefile
index 1497781c8de..bf9c80edb79 100644
--- a/share/doc/usd/10.exref/Makefile
+++ b/share/doc/usd/10.exref/Makefile
@@ -1,11 +1,11 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$Id: Makefile,v 1.3 1995/07/26 13:52:56 wollman Exp $
+#	$Id: Makefile,v 1.4 1995/07/30 08:04:33 bde Exp $
 
 VOLUME=	usd/10.exref
 SRCS=	ex.rm
 MACROS=	-ms
 CLEANFILES=summary.*
-SRCDIR=	${.CURDIR}/../../../../usr.bin/vi/USD.doc/exref
+SRCDIR=	${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/exref
 USE_TBL=	yes
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile
index f77ba6d6a4a..8e7f489b369 100644
--- a/share/doc/usd/11.vitut/Makefile
+++ b/share/doc/usd/11.vitut/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$Id$
+#	$Id: Makefile,v 1.1 1995/01/11 03:24:12 wollman Exp $
 
 VOLUME=	usd/11.edit
 SRCS=	edittut.ms
 MACROS=	-ms
-SRCDIR=	${.CURDIR}/../../../../usr.bin/vi/USD.doc/edit
+SRCDIR=	${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/edit
 USE_TBL=	yes
 
 # index for versatec is different from the one in edit.tut
diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile
index 0cdb548c847..ec832f039f7 100644
--- a/share/doc/usd/12.vi/Makefile
+++ b/share/doc/usd/12.vi/Makefile
@@ -1,11 +1,11 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id: Makefile,v 1.2 1995/07/26 13:52:59 wollman Exp $
+#	$Id: Makefile,v 1.3 1995/07/30 08:04:50 bde Exp $
 
 VOLUME=	usd/12.vi
 SRCS=	vi.in vi.chars
 MACROS=	-ms
 CLEANFILES+=summary.* viapwh.*
-SRCDIR=	${.CURDIR}/../../../../usr.bin/vi/USD.doc/vitut
+SRCDIR=	${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/vitut
 USE_TBL=	yes
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile
index 55a57e47da1..c3ad5c7b03f 100644
--- a/share/doc/usd/13.viref/Makefile
+++ b/share/doc/usd/13.viref/Makefile
@@ -1,17 +1,16 @@
 #	From: @(#)Makefile	8.16 (Berkeley) 8/15/94
-#	$Id: Makefile,v 1.2 1995/05/30 06:58:01 rgrimes Exp $
+#	$Id: Makefile,v 1.3 1995/11/29 16:25:21 bde Exp $
 
 VOLUME=	usd/13.viref
 SRCS=	vi.ref
-EXTRA=	ex.cmd.roff ../../install/recover.script ref.so set.opt.roff \
-	vi.cmd.roff
+EXTRA=	ex.cmd.roff ref.so set.opt.roff vi.cmd.roff
 OBJS=	index.so
 MACROS=	-me
 CLEANFILES+=index index.so
 USE_SOELIM=	yes
 USE_SOELIMPP=	yes
 USE_TBL=	yes
-SRCDIR=	${.CURDIR}/../../../../usr.bin/vi/USD.doc/vi.ref
+SRCDIR=	${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/vi.ref
 
 index.so:: ${SRCS} ${EXTRA}
 ALLSRCS=	${SRCS:S;^;${SRCDIR}/;}