diff --git a/makefile-templates/Makefile.handbook b/makefile-templates/Makefile.handbook
index 20f437c..8a3ae34 100755
--- a/makefile-templates/Makefile.handbook
+++ b/makefile-templates/Makefile.handbook
@@ -143,6 +143,15 @@
 
 ################################################################################
 #
+# Additional LaTeX document class options. These get added to the
+# \documentclass call in the template file. The values are set in
+# latex-includes/paper_variables.make.
+#
+LATEX_OPTIONS:=subjectcode=$(SUBJECT_CODE),papernumber=$(PAPER_NUMBER),papertitle=$(PAPER_TITLE),paperyear=$(PAPER_YEAR),paperperiod=$(PAPER_PERIOD),authors=$(HANDBOOK_AUTHORS)
+
+
+################################################################################
+#
 # Directory to install files into on web server.
 #
 INSTALL_DIRECTORY:=$(HANDBOOK_INSTALL_ROOT)/$(SUBJECT_CODE)$(PAPER_NUMBER)/www/Handbook
@@ -227,7 +236,8 @@
 	@$(ANNOUNCE) "Generating $@"
 	@$(ECHO) "% THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT!" > $@
 	@$(ECHO) >> $@
-	@$(PERL) -p -e "s|\<\@SHOWANSWERS\@\>||;" \
+	@$(PERL) -p -e "s|\<\@SHOWANSWERS\@\>|hideanswers|;" \
+		-e "s|\<\@LATEXOPTIONS\@\>|$(LATEX_OPTIONS)|;" \
 		$(foreach sect,$(SECTION_DIRS),-e "s|\<\@SECTION\[$(notdir $(sect))\]\@\>|\\\\input{$(basename $(filter $(sect)/%,$(QUESTION_TEX_INPUTS)))}|;") $< >> $@
 
 question-pdfs:
@@ -245,7 +255,8 @@
 	@$(ANNOUNCE) "Generating $@"
 	@$(ECHO) "% THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT!" > $@
 	@$(ECHO) >> $@
-	@$(PERL) -p -e "s|\<\@SHOWANSWERS\@\>|\\\\showanswers|;" \
+	@$(PERL) -p -e "s|\<\@SHOWANSWERS\@\>|showanswers|;" \
+		-e "s|\<\@LATEXOPTIONS\@\>|$(LATEX_OPTIONS)|;" \
 		$(foreach sect,$(SECTION_DIRS),-e "s|\<\@SECTION\[$(notdir $(sect))\]\@\>|\\\\input{$(basename $(filter $(sect)/%,$(ANSWER_TEX_INPUTS)))}|;") $< >> $@
 
 answer-pdfs: