diff --git a/makefile-templates/Makefile.handbook b/makefile-templates/Makefile.handbook
index 57a92d7..2c10ece 100755
--- a/makefile-templates/Makefile.handbook
+++ b/makefile-templates/Makefile.handbook
@@ -183,8 +183,7 @@
 #
 # Files to be installed on web server.
 #
-QUESTION_INSTALL_FILES:=handbook.pdf handbook-2up.pdf handbook-answers.pdf \
-	$(wildcard *.png)
+QUESTION_INSTALL_FILES:=handbook.pdf handbook-2up.pdf $(wildcard *.png)
 
 ANSWER_INSTALL_FILES:= handbook-answers.pdf handbook-answers-2up.pdf \
 	$(wildcard *.png)
@@ -334,8 +333,8 @@
 	@$(FIND) $(INSTALL_DIRECTORY) -type l -delete
 	@$(foreach d,$(SECTION_DIRS),if $(MAKE) -C $d $@ NOINIT=x SECTION=$(notdir $(d)); then $(TRUE); else exit 1; fi;)
 	@$(ANNOUNCE) "Creating links in $(INSTALL_DIRECTORY)"
-	@$(foreach f,$(QUESTION_INSTALL_FILES),if $(TEST) -f $(CURDIR)/$(f) -a -n $(filter handbook_root,$QUESTION_INSTALL_PATTERNS); then $(ECHO) "Linking $(f)"; $(LN_S) -f $(CURDIR)/$(f) $(INSTALL_DIRECTORY); fi;)
-	@$(foreach f,$(ANSWER_INSTALL_FILES),if $(TEST) -f $(CURDIR)/$(f) -a -n $(filter handbook_root,$ANSWER_INSTALL_PATTERNS); then $(ECHO) "Linking $(f)"; $(LN_S) -f $(CURDIR)/$(f) $(INSTALL_DIRECTORY); fi;)
+	@$(foreach f,$(QUESTION_INSTALL_FILES),if $(TEST) -f $(CURDIR)/$(f) -a -n "$(filter 'handbook_root',$(QUESTION_INSTALL_PATTERNS))"; then $(ECHO) "Linking $(f)"; $(LN_S) -f $(CURDIR)/$(f) $(INSTALL_DIRECTORY); fi;)
+	@$(foreach f,$(ANSWER_INSTALL_FILES),if $(TEST) -f $(CURDIR)/$(f) -a -n "$(filter 'handbook_root',$(ANSWER_INSTALL_PATTERNS))"; then $(ECHO) "Linking $(f)"; $(LN_S) -f $(CURDIR)/$(f) $(INSTALL_DIRECTORY); fi;)
 	@$(FIND) $(INSTALL_DIRECTORY) -type l ! -exec test -r {} \; -delete
 	@$(ANNOUNCE) "Synchronising with Blackboard"
 	@$(SITECOPY) --update Blackboard$(PAPER_NUMBER)
@@ -386,6 +385,10 @@
 	@$(ECHO) "LATEX_INCLUDES = [$(LATEX_INCLUDES)]"
 	@$(ECHO) "INSTALL_DIRECTORY = [$(INSTALL_DIRECTORY)]"
 	@$(ECHO) "INSTALL_FILES = [$(INSTALL_FILES)]"
+	@$(ECHO) "QUESTION_INSTALL_FILES = [$(QUESTION_INSTALL_FILES)]"
+	@$(ECHO) "ANSWER_INSTALL_FILES = [$(ANSWER_INSTALL_FILES)]"
+	@$(ECHO) "QUESTION_INSTALL_PATTERNS = [$(QUESTION_INSTALL_PATTERNS)]"
+	@$(ECHO) "ANSWER_INSTALL_PATTERNS = [$(ANSWER_INSTALL_PATTERNS)]"
 	@$(ECHO) "WEB_CLEAN_FILES = [$(WEB_CLEAN_FILES)]"
 	@$(ECHO) "PRINT_CLEAN_FILES = [$(PRINT_CLEAN_FILES)]"
 	@$(ECHO) "ALL_CLEAN_FILES = [$(ALL_CLEAN_FILES)]"