diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile
index 8ac6f08b53ef..1447a619c53d 100644
--- a/gnu/usr.bin/cvs/contrib/Makefile
+++ b/gnu/usr.bin/cvs/contrib/Makefile
@@ -1,15 +1,13 @@
-#	$Id: Makefile,v 1.1 1995/12/10 22:59:06 peter Exp $
+#	$Id: Makefile,v 1.2 1995/12/11 00:45:41 peter Exp $
+
+SUBDIR=	 pcl-cvs
 
 SCRIPTS= ccvs-rsh rcs2log clmerge cln_hist commit_prep cvs_acls cvscheck \
 	 log log_accum mfpipe rcs-to-cvs rcs2log rcslock sccs2rcs \
-	 easy-import.pl
+	 easy-import
 
 FILES=	 README cvscheck.man cvshelp.man descend.man intro.doc
 
-PCLCVS=	ChangeLog INSTALL NEWS README \
-	compile-all.el pcl-cvs-lucid.el pcl-cvs-lucid.elc pcl-cvs-startup.el \
-	pcl-cvs.el pcl-cvs.elc pcl-cvs.texinfo
-
 EXAMPDIR=	/usr/share/examples/cvs
 PERLPATH=	/usr/bin/perl
 CLEANFILES+=	$(SCRIPTS)
@@ -34,9 +32,6 @@ afterinstall:
 	cd ${.CURDIR} ; \
 		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 		${FILES} ${DESTDIR}${EXAMPDIR}/contrib
-	cd ${.CURDIR}/pcl-cvs ; \
-		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
-		${PCLCVS} ${DESTDIR}${EXAMPDIR}/pcl-cvs
 
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile b/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile
new file mode 100644
index 000000000000..2285967fc664
--- /dev/null
+++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile
@@ -0,0 +1,16 @@
+#	$Id: Makefile,v 1.2 1995/12/11 00:45:41 peter Exp $
+
+FILES=	ChangeLog INSTALL NEWS README \
+	compile-all.el pcl-cvs-lucid.el pcl-cvs-startup.el \
+	pcl-cvs.el pcl-cvs.texinfo compile.sh
+
+NOOBJ=	noobj
+
+EXAMPDIR=	/usr/share/examples/cvs
+
+afterinstall:
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
+		${PCLCVS} ${DESTDIR}${EXAMPDIR}/pcl-cvs
+
+.include "../../../Makefile.inc"
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cvs/contrib/pcl-cvs/compile.sh b/gnu/usr.bin/cvs/contrib/pcl-cvs/compile.sh
new file mode 100644
index 000000000000..b940370da197
--- /dev/null
+++ b/gnu/usr.bin/cvs/contrib/pcl-cvs/compile.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+emacs -batch -l compile-all.el -f compile-pcl-cvs