diff --git a/share/doc/psd/12.make/Makefile b/share/doc/psd/12.make/Makefile
index b266f9b6f959..c975c7941c4e 100644
--- a/share/doc/psd/12.make/Makefile
+++ b/share/doc/psd/12.make/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 VOLUME=	psd/12.make
-SRCS=	tutorial.ms
+SRCS=	stubs.ms tutorial.ms
 MACROS=	-ms
 SRCDIR=	${.CURDIR}/../../../../usr.bin/make/PSD.doc
 
diff --git a/usr.bin/make/PSD.doc/stubs.ms b/usr.bin/make/PSD.doc/stubs.ms
new file mode 100644
index 000000000000..63c4c144167b
--- /dev/null
+++ b/usr.bin/make/PSD.doc/stubs.ms
@@ -0,0 +1,8 @@
+.\" $FreeBSD$
+.\"
+.de Ix
+..
+.de Rd
+..
+.de Rm
+..
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index d4269ca06488..052ba581dac6 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -63,10 +63,18 @@
 .\" fixed-width font.
 .\" C is a typewriter font for a laserwriter. Use something else if
 .\" you don't have one...
+.ie n \{\
 .de CW
-.ie !\\n(.$ .ft S
-.el \&\\$3\fS\\$1\fP\\$2
+.ie !\\n(.$ .ft R
+.el \&\\$3\fR\\$1\fP\\$2
 ..
+.\}
+.el \{\
+.de CW
+.ie !\\n(.$ .ft C
+.el \&\\$3\fC\\$1\fP\\$2
+..
+.\}
 .\" Anything I put in a display I want to be in fixed-width
 .am DS
 .CW
@@ -84,6 +92,7 @@
 .mk 
 .nr g3 \\n(.f
 .nr g4 \\n(.s
+.ig ft
 .sp -1
 .\" .st cf
 \D's -1u'\D't 5u'
@@ -103,6 +112,7 @@
 \h'85u'\v'0.85n'\h-\w\\*(g9u/2u\&\\*(g9
 .sp |\\n(g8u
 .sp 166u
+.ig br
 \D't 3u'\D's -1u'
 .br
 .po