diff --git a/sys/os2/Makefile.os2 b/sys/os2/Makefile.os2
index e52f6e3e4..31d4d7b54 100644
--- a/sys/os2/Makefile.os2
+++ b/sys/os2/Makefile.os2
@@ -1,4 +1,4 @@
-#	SCCS Id: @(#)Makefile.os2	3.5	2006/01/07
+#	SCCS Id: @(#)Makefile.os2	3.5	2007/05/25
 #	OS/2 NetHack 3.5 Makefile for OS/2 versions 1.x and 2.x
 #	Copyright (C) 1990, 1991, 1992, 1993, 1996 Timo Hakulinen
 #
@@ -1458,8 +1458,12 @@ $(GAMEDIR)\nethack.cnf :
 #
 #	Documentation.
 #
+#	LaTeX needs to be run twice.
+#	The second pass uses the $(GUIDEBOO).aux file made by the first.
+#
 
 $(TEMP)\$(GUIDEBOO).dvi : $(DOC)\$(GUIDEBOO).tex
+	$(LATEX) $(DOC)\$(GUIDEBOO).tex
 	$(LATEX) $(DOC)\$(GUIDEBOO).tex
 	$(CP) $(GUIDEBOO).dvi $(TEMP)
 	$(CP) $(GUIDEBOO).aux $(TEMP)
diff --git a/sys/unix/Makefile.doc b/sys/unix/Makefile.doc
index 8244fef77..e9ab86743 100644
--- a/sys/unix/Makefile.doc
+++ b/sys/unix/Makefile.doc
@@ -1,5 +1,5 @@
 #	NetHack Makefile.
-#	SCCS Id: @(#)Makefile.doc	3.5	1996/03/23
+#	SCCS Id: @(#)Makefile.doc	3.5	2007/05/25
 
 # for Atari
 # SHELL=E:/GEMINI2/MUPFEL.TTP
@@ -36,8 +36,10 @@ Guidebook.ps:	Guidebook.mn
 # Guidebook.tex is the same as Guidebook.mn but formatted with LaTeX.
 # - The invocation command for LaTeX may vary in different installations.
 # - To print Guidebook.dvi you need to use a suitable dvi-driver.
+# - LaTeX needs to be run twice; second pass uses Guidebook.aux made by first.
 Guidebook.dvi:	Guidebook.tex
 	latex Guidebook.tex
+	latex Guidebook.tex
 
 
 GAME	= nethack
diff --git a/sys/vms/Makefile.doc b/sys/vms/Makefile.doc
index cd5aa2947..228b1a37a 100644
--- a/sys/vms/Makefile.doc
+++ b/sys/vms/Makefile.doc
@@ -1,5 +1,5 @@
 #	NetHack Makefile (VMS) - for the [Unix] documentation.
-#	SCCS Id: @(#)Makefile.doc	3.5	1993/01/06
+#	SCCS Id: @(#)Makefile.doc	3.5	2007/05/25
 
 #  Copy this file to [.doc]Makefile. and edit it if needed.
 
@@ -32,8 +32,10 @@ Guidebook.ps :	Guidebook.dvi		# generated with LaTeX
 # Guidebook.tex is the same as Guidebook.mn but formatted with LaTeX.
 # - The invocation command for LaTeX may vary in different installations.
 # - To print Guidebook.dvi you need to use a suitable dvi-driver.
+# - LaTeX needs to be run twice; second pass uses Guidebook.aux made by first.
 Guidebook.dvi :  Guidebook.tex
 	latex Guidebook.tex
+	latex Guidebook.tex
 
 all : $(ALLDOCS)
 	$(NOOP)