diff --git a/share/doc/psd/01.cacm/Makefile b/share/doc/psd/01.cacm/Makefile
index 5bebef5da04b..7a8806136887 100644
--- a/share/doc/psd/01.cacm/Makefile
+++ b/share/doc/psd/01.cacm/Makefile
@@ -3,7 +3,9 @@
 
 VOLUME=	psd/01.cacm
 SRCS=	p.mac p1 p2 p3 p4 p5 p6
+EXTRA=	ref.bib
 MACROS=	-ms
-# REFER=	refer -p /usr/old/dict/papers/Ind -e
+
+USE_REFER=	yes
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/01.cacm/p1 b/share/doc/psd/01.cacm/p1
index 88987e02bb06..2767eebb26c8 100644
--- a/share/doc/psd/01.cacm/p1
+++ b/share/doc/psd/01.cacm/p1
@@ -5,6 +5,10 @@
 .\"	@(#)p1	8.1 (Berkeley) 6/8/93
 .\"
 .\" $FreeBSD$
+.R1
+database ref.bib
+accumulate
+.R2
 .OH 'The UNIX Time-Sharing System''PSD:1-%'
 .EH 'PSD:1-%''The UNIX Time-Sharing System'
 .ds n \s+2
diff --git a/share/doc/psd/01.cacm/ref.bib b/share/doc/psd/01.cacm/ref.bib
new file mode 100644
index 000000000000..c4283b5806c3
--- /dev/null
+++ b/share/doc/psd/01.cacm/ref.bib
@@ -0,0 +1,113 @@
+# $FreeBSD$
+
+%A L. P. Deutsch
+%A B. W. Lampson
+%T An online editor
+%J Comm. Assoc. Comp. Mach.
+%V 10
+%N 12
+%D December 1967
+%P 793-799, 803
+%K qed
+
+%K cstr
+%R Comp. Sci. Tech. Rep. No. 17
+%I Bell Laboratories
+%C Murray Hill, New Jersey
+%A B. W. Kernighan
+%A L. L. Cherry
+%T A System for Typesetting Mathematics
+%d May 1974, revised April 1977
+%J Comm. Assoc. Comp. Mach.
+%K acm cacm
+%V 18
+%P 151-157
+%D March 1975
+
+%T U\s-2NIX\s0 Time-Sharing System: Document Preparation
+%K unix bstj
+%A B. W. Kernighan
+%A M. E. Lesk
+%A J. F. Ossanna
+%J Bell Sys. Tech. J.
+%V 57
+%N 6
+%P 2115-2135
+%D 1978
+
+%A T. A. Dolotta
+%A J. R. Mashey
+%T An Introduction to the Programmer's Workbench
+%J Proc. 2nd Int. Conf. on Software Engineering
+%D October 13-15, 1976
+%P 164-168
+
+%T U\s-2NIX\s0 Time-Sharing System: The Programmer's Workbench
+%A T. A. Dolotta
+%A R. C. Haight
+%A J. R. Mashey
+%J Bell Sys. Tech. J.
+%V 57
+%N 6
+%P 2177-2200
+%D 1978
+%K unix bstj
+
+%T U\s-2NIX\s0 Time-Sharing System: U\s-2NIX\s0 on a Microprocessor
+%K unix bstj
+%A H. Lycklama
+%J Bell Sys. Tech. J.
+%V 57
+%N 6
+%P 2087-2101
+%D 1978
+
+%T The C Programming Language
+%A B. W. Kernighan
+%A D. M. Ritchie
+%I Prentice-Hall
+%C Englewood Cliffs, New Jersey
+%D 1978
+
+%T Computer Recreations
+%A Aleph-null
+%J Software Practice and Experience
+%V 1
+%N 2
+%D April-June 1971
+%P 201-204
+
+%T U\s-2NIX\s0 Time-Sharing System: The U\s-2NIX\s0 Shell
+%A S. R. Bourne
+%K unix bstj
+%J Bell Sys. Tech. J.
+%V 57
+%N 6
+%P 1971-1990
+%D 1978
+
+%A L. P. Deutsch
+%A B. W. Lampson
+%T \*sSDS\*n 930 time-sharing system preliminary reference manual
+%R Doc. 30.10.10, Project \*sGENIE\*n
+%C Univ. Cal. at Berkeley
+%D April 1965
+
+%A R. J. Feiertag
+%A E. I. Organick
+%T The Multics input-output system
+%J Proc. Third Symposium on Operating Systems Principles
+%D October 18-20, 1971
+%P 35-41
+
+%A D. G. Bobrow
+%A J. D. Burchfiel
+%A D. L. Murphy
+%A R. S. Tomlinson
+%T \*sTENEX\*n, a Paged Time Sharing System for the \*sPDP\*n-10
+%J Comm. Assoc. Comp. Mach.
+%V 15
+%N 3
+%D March 1972
+%K tenex
+%P 135-143
diff --git a/share/doc/psd/02.implement/Makefile b/share/doc/psd/02.implement/Makefile
index 930b3b58094d..0eb5e6bfbace 100644
--- a/share/doc/psd/02.implement/Makefile
+++ b/share/doc/psd/02.implement/Makefile
@@ -3,9 +3,12 @@
 
 VOLUME=	psd/02.implement
 SRCS=	implement
+EXTRA=	ref.bib
 MACROS=	-ms
-USE_PIC=yes
-USE_TBL=yes
-# REFER=	refer -p /usr/old/dict/papers/Ind -e
+
+USE_PIC=	yes
+USE_REFER=	yes
+USE_SOELIM=	yes
+USE_TBL=	yes
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/02.implement/implement b/share/doc/psd/02.implement/implement
index b5f20d2ae6c5..debc03bce73a 100644
--- a/share/doc/psd/02.implement/implement
+++ b/share/doc/psd/02.implement/implement
@@ -40,6 +40,10 @@
 .\"	@(#)implement	8.1 (Berkeley) 6/8/93
 .\"
 .\" $FreeBSD$
+.R1
+database ref.bib
+accumulate
+.R2
 .EH 'PSD:2-%''UNIX Implementation'
 .OH 'UNIX Implementation''PSD:2-%'
 .de P1
@@ -281,9 +285,9 @@ all the data associated with a process
 may be accessed
 starting from the process table entry.
 .KF
-.in .375i
+.if t .in .375i
 .so fig1.pic
-.in -.375i
+.if t .in -.375i
 .sp 2v
 .ce
 Fig. 1\(emProcess control data structure.
@@ -1023,9 +1027,9 @@ away,
 the table entry is copied back to the
 secondary store i-list and the table entry is freed.
 .KF
-.in .25i
+.if t .in .25i
 .so fig2.pic
-.in -.25i
+.if t .in -.25i
 .sp 2v
 .ce
 Fig. 2\(emFile system data structure.
diff --git a/share/doc/psd/02.implement/ref.bib b/share/doc/psd/02.implement/ref.bib
new file mode 100644
index 000000000000..34140640e8bc
--- /dev/null
+++ b/share/doc/psd/02.implement/ref.bib
@@ -0,0 +1,54 @@
+# $FreeBSD$
+
+%T U\s-2NIX\s0 Time-Sharing System: The U\s-2NIX\s0 Shell
+%A S. R. Bourne
+%K unix bstj
+%J Bell Sys. Tech. J.
+%V 57
+%N 6
+%P 1971-1990
+%D 1978
+
+%A R. E. Griswold
+%A D. R. Hanson
+%T An Overview of SL5
+%J SIGPLAN Notices
+%V 12
+%N 4
+%D April 1977
+%P 40-50
+
+%A E. W. Dijkstra
+%T Cooperating Sequential Processes
+%B Programming Languages
+%E F. Genuys
+%I Academic Press
+%C New York
+%D 1968
+%P 43-112
+
+%A J. A. Hawley
+%A W. B. Meyer
+%T M\s-2UNIX\s0, A Multiprocessing Version of U\s-2NIX\s0
+%K munix unix
+%R M.S. Thesis
+%I Naval Postgraduate School
+%C Monterey, Cal.
+%D 1975
+
+%T The U\s-2NIX\s0 Time-Sharing System
+%K unix bstj
+%A D. M. Ritchie
+%A K. Thompson
+%J Bell Sys. Tech. J.
+%V 57
+%N 6
+%P 1905-1929
+%D 1978
+
+%A E. I. Organick
+%T The M\s-2ULTICS\s0 System
+%K multics
+%I M.I.T. Press
+%C Cambridge, Mass.
+%D 1972
diff --git a/share/doc/psd/15.yacc/Makefile b/share/doc/psd/15.yacc/Makefile
index 91928f94d61e..293ead5bfa0a 100644
--- a/share/doc/psd/15.yacc/Makefile
+++ b/share/doc/psd/15.yacc/Makefile
@@ -3,6 +3,9 @@
 
 VOLUME=	psd/15.yacc
 SRCS=	ss.. ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 ssA ssB ssa ssb ssc ssd
+EXTRA=	ref.bib
 MACROS=	-ms
 
+USE_REFER=	yes
+
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/15.yacc/ref.bib b/share/doc/psd/15.yacc/ref.bib
new file mode 100644
index 000000000000..a1364f608f51
--- /dev/null
+++ b/share/doc/psd/15.yacc/ref.bib
@@ -0,0 +1,71 @@
+# $FreeBSD$
+
+%T The C Programming Language
+%A B. W. Kernighan
+%A D. M. Ritchie
+%I Prentice-Hall
+%C Englewood Cliffs, New Jersey
+%D 1978
+
+%T LR Parsing
+%A A. V. Aho
+%A S. C. Johnson
+%J Comp. Surveys
+%V 6
+%N 2
+%P 99-124
+%D June 1974
+
+%T Deterministic Parsing of Ambiguous Grammars
+%A A. V. Aho
+%A S. C. Johnson
+%A J. D. Ullman
+%J Comm. Assoc. Comp. Mach.
+%K acm cacm
+%V 18
+%N 8
+%P 441-452
+%D August 1975
+
+%A A. V. Aho
+%A J. D. Ullman
+%T Principles of Compiler Design
+%I Addison-Wesley
+%C Reading, Mass.
+%D 1977
+
+%R Comp. Sci. Tech. Rep. No. 65
+%K CSTR
+%A S. C. Johnson
+%T Lint, a C Program Checker
+%D December 1977
+%O updated version TM 78-1273-3
+%D 1978
+
+%T A Portable Compiler: Theory and Practice
+%A S. C. Johnson
+%J Proc. 5th ACM Symp. on Principles of Programming Languages
+%P 97-104
+%D January 1978
+
+%K cstr
+%R Comp. Sci. Tech. Rep. No. 17
+%I Bell Laboratories
+%C Murray Hill, New Jersey
+%A B. W. Kernighan
+%A L. L. Cherry
+%T A System for Typesetting Mathematics
+%d May 1974, revised April 1977
+%J Comm. Assoc. Comp. Mach.
+%K acm cacm
+%V 18
+%P 151-157
+%D March 1975
+
+%K CSTR
+%R Comp. Sci. Tech. Rep. No. 39
+%I Bell Laboratories
+%C Murray Hill, New Jersey
+%A M. E. Lesk
+%T Lex \(em A Lexical Analyzer Generator
+%D October 1975
diff --git a/share/doc/psd/15.yacc/ss.. b/share/doc/psd/15.yacc/ss..
index 5249c1fc81a6..65bea27d54dc 100644
--- a/share/doc/psd/15.yacc/ss..
+++ b/share/doc/psd/15.yacc/ss..
@@ -37,6 +37,10 @@
 .\"	@(#)ss..	8.1 (Berkeley) 6/8/93
 .\"
 .\" $FreeBSD$
+.R1
+database ref.bib
+accumulate
+.R2
 .EH 'PSD:15-%''Yacc: Yet Another Compiler-Compiler'
 .OH 'Yacc: Yet Another Compiler-Compiler''PSD:15-%'
 .\".RP
@@ -49,7 +53,6 @@ Stephen C. Johnson
 AT&T Bell Laboratories
 Murray Hill, New Jersey 07974
 .AI
-.MH
 .AB
 .PP
 Computer program input generally has some structure;