diff --git a/share/doc/psd/01.cacm/Makefile b/share/doc/psd/01.cacm/Makefile
index 88ac036a320..5bebef5da04 100644
--- a/share/doc/psd/01.cacm/Makefile
+++ b/share/doc/psd/01.cacm/Makefile
@@ -5,23 +5,5 @@ VOLUME=	psd/01.cacm
 SRCS=	p.mac p1 p2 p3 p4 p5 p6
 MACROS=	-ms
 # REFER=	refer -p /usr/old/dict/papers/Ind -e
-GROFF=	groff
-
-all: paper.ps paper.ascii
-
-paper.ps: ${SRCS}
-	${REFER} ${SRCS} | ${TBL} | ${GROFF} ${MACROS} - > ${.TARGET}
-
-paper.ascii: ${SRCS}
-	${REFER} ${SRCS} | ${TBL} | ${ROFF} ${MACROS} - > ${.TARGET}
-
-paper.ascii.gz: paper.ascii
-paper.ps.gz: paper.ps
-
-paper.ascii.gz paper.ps.gz:
-	gzip -f ${.TARGET:.gz=}
-
-clean:
-	rm -f paper.* *.spell errs Errs make.out
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/02.implement/Makefile b/share/doc/psd/02.implement/Makefile
index 9a810d8bb1c..930b3b58094 100644
--- a/share/doc/psd/02.implement/Makefile
+++ b/share/doc/psd/02.implement/Makefile
@@ -4,24 +4,8 @@
 VOLUME=	psd/02.implement
 SRCS=	implement
 MACROS=	-ms
+USE_PIC=yes
+USE_TBL=yes
 # REFER=	refer -p /usr/old/dict/papers/Ind -e
-GROFF=	groff
-
-all: paper.ps paper.ascii
-
-paper.ps: ${SRCS}
-	${SOELIM} ${SRCS} | ${REFER} | ${PIC} | ${GROFF} ${MACROS} - > ${.TARGET}
-
-paper.ascii: ${SRCS}
-	${SOELIM} ${SRCS} | ${REFER} | ${PIC} | ${ROFF} ${MACROS} - > ${.TARGET}
-
-paper.ascii.gz: paper.ascii
-paper.ps.gz: paper.ps
-
-paper.ascii.gz paper.ps.gz:
-	gzip -f ${.TARGET:.gz=}
-
-clean:
-	rm -f paper.* *.spell errs Errs make.out
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/04.uprog/Makefile b/share/doc/psd/04.uprog/Makefile
index 0833aa3bc51..f149dcf2742 100644
--- a/share/doc/psd/04.uprog/Makefile
+++ b/share/doc/psd/04.uprog/Makefile
@@ -4,23 +4,5 @@
 VOLUME=	psd/04.uprog
 SRCS=	p.mac p0 p1 p2 p3 p4 p5 p6 p8 p9
 MACROS=	-ms
-GROFF=	groff
-
-all: paper.ps paper.ascii
-
-paper.ps: ${SRCS}
-	${GROFF} ${MACROS} ${SRCS} > ${.TARGET}
-
-paper.ascii: ${SRCS}
-	${ROFF} ${MACROS} ${SRCS} > ${.TARGET}
-
-paper.ascii.gz: paper.ascii
-paper.ps.gz: paper.ps
-
-paper.ascii.gz paper.ps.gz:
-	gzip -f ${.TARGET:.gz=}
-
-clean:
-	rm -f paper.* *.spell errs Errs make.out Make.log *~
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/06.Clang/Makefile b/share/doc/psd/06.Clang/Makefile
index 6116fa405b0..28bc6871b16 100644
--- a/share/doc/psd/06.Clang/Makefile
+++ b/share/doc/psd/06.Clang/Makefile
@@ -4,23 +4,5 @@
 DIR=	psd/06.Clang
 SRCS=	Clang.ms
 MACROS=	-ms
-GROFF=	groff
-
-all: paper.ps paper.ascii
-
-paper.ps: ${SRCS}
-	${TBL} ${SRCS} | ${GROFF} ${MACROS} - > ${.TARGET}
-
-paper.ascii: ${SRCS}
-	${TBL} ${SRCS} | ${ROFF} ${MACROS} - > ${.TARGET}
-
-paper.ascii.gz: paper.ascii
-paper.ps.gz: paper.ps
-
-paper.ascii.gz paper.ps.gz:
-	gzip -f ${.TARGET:.gz=}
-
-clean:
-	rm -f paper.* *.spell errs Errs make.out Make.log *~
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/15.yacc/Makefile b/share/doc/psd/15.yacc/Makefile
index 3b41aa41e71..dff226a6bb7 100644
--- a/share/doc/psd/15.yacc/Makefile
+++ b/share/doc/psd/15.yacc/Makefile
@@ -6,21 +6,4 @@ SRCS=	ss.. ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 ssA ssB ssa ssb ssc ssd
 MACROS=	-ms
 GROFF=	groff
 
-all: paper.ps paper.ascii
-
-paper.ps: ${SRCS}
-	${REFER} ${SRCS} | ${GROFF} ${MACROS} - > ${.TARGET}
-
-paper.ascii: ${SRCS}
-	${REFER} ${SRCS} | ${ROFF} ${MACROS} - > ${.TARGET}
-
-paper.ascii.gz: paper.ascii
-paper.ps.gz: paper.ps
-
-paper.ascii.gz paper.ps.gz:
-	gzip -f ${.TARGET:.gz=}
-
-clean:
-	rm -f paper.* *.spell errs Errs make.out
-
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/16.lex/Makefile b/share/doc/psd/16.lex/Makefile
index 6f18b528ee4..4995027a245 100644
--- a/share/doc/psd/16.lex/Makefile
+++ b/share/doc/psd/16.lex/Makefile
@@ -6,21 +6,4 @@ SRCS=	lex.ms
 MACROS=	-ms
 GROFF=	groff
 
-all: paper.ps paper.ascii
-
-paper.ps: ${SRCS}
-	${TBL} ${SRCS} | ${GROFF} ${MACROS} - > ${.TARGET}
-
-paper.ascii: ${SRCS}
-	${TBL} ${SRCS} | ${ROFF} ${MACROS} - > ${.TARGET}
-
-paper.ascii.gz: paper.ascii
-paper.ps.gz: paper.ps
-
-paper.ascii.gz paper.ps.gz:
-	gzip -f ${.TARGET:.gz=}
-
-clean:
-	rm -f paper.* *.spell errs Errs make.out Make.log *~
-
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/17.m4/Makefile b/share/doc/psd/17.m4/Makefile
index 0f99fff6117..9ba541234f1 100644
--- a/share/doc/psd/17.m4/Makefile
+++ b/share/doc/psd/17.m4/Makefile
@@ -3,24 +3,7 @@
 
 DIR=	psd/17.m4
 SRCS=	m4.ms
-MACROS=	-msU
+MACROS=	-ms
 GROFF=	groff
 
-all: paper.ps paper.ascii
-
-paper.ps: ${SRCS}
-	${GROFF} ${MACROS} ${SRCS} > ${.TARGET}
-
-paper.ascii: ${SRCS}
-	${ROFF} ${MACROS} ${SRCS} > ${.TARGET}
-
-paper.ascii.gz: paper.ascii
-paper.ps.gz: paper.ps
-
-paper.ascii.gz paper.ps.gz:
-	gzip -f ${.TARGET:.gz=}
-
-clean:
-	rm -f paper.* *.spell errs Errs make.out Make.log *~
-
 .include <bsd.doc.mk>