diff --git a/makefile-templates/Makefile.handbook b/makefile-templates/Makefile.handbook
index 8a3ae34..6b372ba 100755
--- a/makefile-templates/Makefile.handbook
+++ b/makefile-templates/Makefile.handbook
@@ -143,11 +143,14 @@
 
 ################################################################################
 #
-# Additional LaTeX document class options. These get added to the
-# \documentclass call in the template file. The values are set in
+# Additional options for the coursehandbook document class to set up
+# the details of the paper. These get included in a call to the
+# \papersetup macro in the template file (including the options
+# directly into the \documentclass is problematic --- see
+# coursehandbook.cls for details). 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)
+PAPER_OPTIONS:=subjectcode=$(SUBJECT_CODE),papernumber=$(PAPER_NUMBER),papertitle=$(PAPER_TITLE),paperyear=$(PAPER_YEAR),paperperiod=$(PAPER_PERIOD),authors=$(HANDBOOK_AUTHORS)
 
 
 ################################################################################
@@ -237,7 +240,7 @@
 	@$(ECHO) "% THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT!" > $@
 	@$(ECHO) >> $@
 	@$(PERL) -p -e "s|\<\@SHOWANSWERS\@\>|hideanswers|;" \
-		-e "s|\<\@LATEXOPTIONS\@\>|$(LATEX_OPTIONS)|;" \
+		-e "s|\<\@PAPEROPTIONS\@\>|$(PAPER_OPTIONS)|;" \
 		$(foreach sect,$(SECTION_DIRS),-e "s|\<\@SECTION\[$(notdir $(sect))\]\@\>|\\\\input{$(basename $(filter $(sect)/%,$(QUESTION_TEX_INPUTS)))}|;") $< >> $@
 
 question-pdfs:
@@ -256,7 +259,7 @@
 	@$(ECHO) "% THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT!" > $@
 	@$(ECHO) >> $@
 	@$(PERL) -p -e "s|\<\@SHOWANSWERS\@\>|showanswers|;" \
-		-e "s|\<\@LATEXOPTIONS\@\>|$(LATEX_OPTIONS)|;" \
+		-e "s|\<\@PAPEROPTIONS\@\>|$(PAPER_OPTIONS)|;" \
 		$(foreach sect,$(SECTION_DIRS),-e "s|\<\@SECTION\[$(notdir $(sect))\]\@\>|\\\\input{$(basename $(filter $(sect)/%,$(ANSWER_TEX_INPUTS)))}|;") $< >> $@
 
 answer-pdfs:
@@ -353,6 +356,13 @@
 	@$(ECHO) "WEB_CLEAN_FILES = [$(WEB_CLEAN_FILES)]"
 	@$(ECHO) "PRINT_CLEAN_FILES = [$(PRINT_CLEAN_FILES)]"
 	@$(ECHO) "ALL_CLEAN_FILES = [$(ALL_CLEAN_FILES)]"
+	@$(ECHO) "SUBJECT_CODE = [$(SUBJECT_CODE)]"
+	@$(ECHO) "PAPER_NUMBER = [$(PAPER_NUMBER)]"
+	@$(ECHO) "PAPER_TITLE = [$(PAPER_TITLE)]"
+	@$(ECHO) "PAPER_YEAR = [$(PAPER_YEAR)]"
+	@$(ECHO) "PAPER_PERIOD = [$(PAPER_PERIOD)]"
+	@$(ECHO) "HANDBOOK_AUTHORS = [$(HANDBOOK_AUTHORS)]"
+	@$(ECHO) "PAPER_OPTIONS = [$(PAPER_OPTIONS)]"
 
 
 ################################################################################