diff --git a/gnu/usr.bin/cvs/Makefile b/gnu/usr.bin/cvs/Makefile
index 70ba49f0a9ef..46021395df2d 100644
--- a/gnu/usr.bin/cvs/Makefile
+++ b/gnu/usr.bin/cvs/Makefile
@@ -1,5 +1,5 @@
-#	$Id$
+#	$Id: Makefile,v 1.10 1997/02/22 15:45:10 peter Exp $
 
-SUBDIR = lib cvs contrib cvsbug doc tools
+SUBDIR = lib libdiff cvs contrib cvsbug doc tools
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc
index e8a0c54b54aa..e1889d679ced 100644
--- a/gnu/usr.bin/cvs/Makefile.inc
+++ b/gnu/usr.bin/cvs/Makefile.inc
@@ -3,12 +3,20 @@
 CVSDIR=		$(.CURDIR)/../../../../contrib/cvs
 
 .if exists(${.OBJDIR}/../lib)
-LIBDESTDIR=	${.OBJDIR}/../lib
+LIBCVSDIR=	${.OBJDIR}/../lib
 .else
-LIBDESTDIR=	${.CURDIR}/../lib
+LIBCVSDIR=	${.CURDIR}/../lib
 .endif
 
-LIBCVS=		${LIBDESTDIR}/libcvs.a
+LIBCVS=		${LIBCVSDIR}/libcvs.a
+
+.if exists(${.OBJDIR}/../libdiff)
+LIBDIFFDIR=	${.OBJDIR}/../libdiff
+.else
+LIBDIFFDIR=	${.CURDIR}/../libdiff
+.endif
+
+LIBDIFF=	${LIBDIFFDIR}/libdiff.a
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index 4ec4847e06ec..f752a6862e8d 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.18 1997/10/10 04:03:17 peter Exp $
+#	$Id: Makefile,v 1.19 1997/12/17 15:11:41 bde Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -21,8 +21,8 @@ SRCS=	add.c admin.c buffer.c checkin.c checkout.c classify.c client.c \
 
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../lib -I${CVSDIR}/src -I${CVSDIR}/lib -DHAVE_CONFIG_H
 
-DPADD+=	${LIBCVS} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-LDADD+=	-L${LIBDESTDIR} -lcvs -lgnuregex -lmd -lcrypt -lz
+DPADD+=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
+LDADD+=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
 
 .if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
 CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT