diff --git a/makefile-templates/Makefile.handbook b/makefile-templates/Makefile.handbook
index e1505d5..d7972f5 100755
--- a/makefile-templates/Makefile.handbook
+++ b/makefile-templates/Makefile.handbook
@@ -196,8 +196,10 @@
 
 handbook.tex: handbook_template.tex $(QUESTION_TEX_INPUTS) $(LOCAL_HANDBOOK_INCLUDE)/questions.patterns $(LATEX_INCLUDES)
 	@announce "Generating $@"
+	@echo "% THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT!" > $@
+	@echo >> $@
 	@perl -p -e "s|\<\@SHOWANSWERS\@\>||;" \
-		$(foreach sect,$(SECTION_DIRS),-e "s|\<\@SECTION\[$(notdir $(sect))\]\@\>|\\\\input{$(basename $(filter $(sect)/%,$(QUESTION_TEX_INPUTS)))}|;") $< > $@
+		$(foreach sect,$(SECTION_DIRS),-e "s|\<\@SECTION\[$(notdir $(sect))\]\@\>|\\\\input{$(basename $(filter $(sect)/%,$(QUESTION_TEX_INPUTS)))}|;") $< >> $@
 
 question-pdfs:
 	@$(foreach d,$(SECTION_DIRS),$(MAKE) -C $d question-pdfs NOINIT=x SECTION=$(notdir $(d));)
@@ -212,8 +214,10 @@
 
 handbook-answers.tex: handbook_template.tex $(ANSWER_TEX_INPUTS) $(LOCAL_HANDBOOK_INCLUDE)/answers.patterns $(LATEX_INCLUDES)
 	@announce "Generating $@"
+	@echo "% THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT!" > $@
+	@echo >> $@
 	@perl -p -e "s|\<\@SHOWANSWERS\@\>|\\\\showanswers|;" \
-		$(foreach sect,$(SECTION_DIRS),-e "s|\<\@SECTION\[$(notdir $(sect))\]\@\>|\\\\input{$(basename $(filter $(sect)/%,$(QUESTION_TEX_INPUTS)))}|;") $< > $@
+		$(foreach sect,$(SECTION_DIRS),-e "s|\<\@SECTION\[$(notdir $(sect))\]\@\>|\\\\input{$(basename $(filter $(sect)/%,$(ANSWER_TEX_INPUTS)))}|;") $< >> $@
 
 answer-pdfs:
 	@$(foreach d,$(SECTION_DIRS),$(MAKE) -C $d answer-pdfs NOINIT=x SECTION=$(notdir $(d));)