Index: projects/doctools/share/doc/psd/01.cacm/Makefile
===================================================================
--- projects/doctools/share/doc/psd/01.cacm/Makefile	(revision 306920)
+++ projects/doctools/share/doc/psd/01.cacm/Makefile	(revision 306921)
@@ -1,16 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 # $FreeBSD$
 
 VOLUME=		psd/01.cacm
-SRCS=		stubs p.mac p1 p2 p3 p4 p5 p6
-EXTRA=		ref.bib
+SRCS=		p.mac p1 p2 p3 p4 p5 p6
+REFER_ARGS=	-e -p ${.CURDIR}/ref.bib
 MACROS=		-ms
 USE_REFER=
 USE_TBL=
-CLEANFILES=	stubs
-
-stubs:
-	@(echo .R1; echo database ${.CURDIR}/ref.bib; \
-	    echo accumulate; echo .R2) > ${.TARGET}
 
 .include <bsd.doc.mk>
Index: projects/doctools/share/doc/psd/02.implement/Makefile
===================================================================
--- projects/doctools/share/doc/psd/02.implement/Makefile	(revision 306920)
+++ projects/doctools/share/doc/psd/02.implement/Makefile	(revision 306921)
@@ -1,17 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 # $FreeBSD$
 
 VOLUME=		psd/02.implement
-SRCS=		stubs implement
-EXTRA=		ref.bib
+SRCS=		implement
+REFER_ARGS=	-e -p ${.CURDIR}/ref.bib
 MACROS=		-ms
 USE_PIC=
 USE_REFER=
 USE_SOELIM=
-CLEANFILES=	stubs
-
-stubs:
-	@(echo .R1; echo database ${.CURDIR}/ref.bib; \
-	    echo accumulate; echo .R2) > ${.TARGET}
 
 .include <bsd.doc.mk>
Index: projects/doctools/share/doc/psd/15.yacc/Makefile
===================================================================
--- projects/doctools/share/doc/psd/15.yacc/Makefile	(revision 306920)
+++ projects/doctools/share/doc/psd/15.yacc/Makefile	(revision 306921)
@@ -1,16 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
 # $FreeBSD$
 
 VOLUME=		psd/15.yacc
-SRCS=		stubs ss_ ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 \
+SRCS=		ss_ ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 \
 		ss10 ss11 ssa ssb ssc ssd
 EXTRA=		ref.bib
 MACROS=		-ms
+REFER_ARGS=	-e -p ${.CURDIR}/ref.bib
 USE_REFER=
-CLEANFILES=	stubs
-
-stubs:
-	@(echo .R1; echo database ${.CURDIR}/ref.bib; \
-	    echo accumulate; echo .R2) > ${.TARGET}
 
 .include <bsd.doc.mk>