diff --git a/make-includes/build_misc_rules.make b/make-includes/build_misc_rules.make
index b122e48..a09ae81 100755
--- a/make-includes/build_misc_rules.make
+++ b/make-includes/build_misc_rules.make
@@ -83,6 +83,21 @@
 
 ################################################################################
 #
+# Files to be installed on web server.
+#
+ifdef HAS_ANSWERS
+QUESTION_INSTALL_FILES:=$(WEB_QUESTIONS_HTML) $(PRINT_QUESTIONS_PDF_1UP) \
+	$(PRINT_QUESTIONS_PDF_2UP) $(wildcard *.png)
+
+ANSWER_INSTALL_FILES:=$(WEB_ANSWERS_HTML) $(PRINT_ANSWERS_PDF_1UP) \
+	$(PRINT_ANSWERS_PDF_2UP) $(wildcard *.png)
+else
+INSTALL_FILES:=$(WEB_HTML) $(PRINT_PDF_1UP) $(PRINT_PDF_2UP) $(wildcard *.png)
+endif
+
+
+################################################################################
+#
 # Add standard file suffixes.
 #
 include $(GLOBAL_HANDBOOK_INCLUDE)/standard_suffixes.make
@@ -269,12 +284,16 @@
 # at the other end. That is, something like "images/foo.pdf" will go into
 # the installation directory as "foo.pdf", not "images/foo.pdf".
 #
-install: questions answers
+install: all
 	@$(ANNOUNCE) "Building deployment links"
 	@$(TEST) -d $(HANDBOOK_INSTALL_ROOT)
 	@$(MKDIR_P) $(INSTALL_DIRECTORY)
 	@$(FIND) $(INSTALL_DIRECTORY) -type l -delete
-	@$(foreach f,$(INSTALL_FILES),if $(TEST) ! -f $(INSTALL_DIRECTORY)/$(f) -o $(CURDIR)/$(f) -nt $(INSTALL_DIRECTORY)/$(f); then $(ECHO) "Linking $(f)"; $(LN_S) -f $(CURDIR)/$(f) $(INSTALL_DIRECTORY); fi;)
+ifdef HAS_ANSWERS
+	@$(foreach f,$(QUESTION_INSTALL_FILES) $(ANSWER_INSTALL_FILES),if $(TEST) -f $(CURDIR)/$(f); then $(ECHO) "Linking $(f)"; $(LN_S) -f $(CURDIR)/$(f) $(INSTALL_DIRECTORY); fi;)
+else
+	@$(foreach f,$(INSTALL_FILES),if $(TEST) -f $(CURDIR)/$(f); then $(ECHO) "Linking $(f)"; $(LN_S) -f $(CURDIR)/$(f) $(INSTALL_DIRECTORY); fi;)
+endif
 	@$(ANNOUNCE) "Synchronising with Blackboard"
 	@$(SITECOPY) --update Blackboard$(PAPER_NUMBER)
 
@@ -303,11 +322,14 @@
 	@echo "PRINT_ANSWERS_PDF_1UP = [$(PRINT_ANSWERS_PDF_1UP)]"
 	@echo "PRINT_QUESTIONS_PDF_2UP = [$(PRINT_QUESTIONS_PDF_2UP)]"
 	@echo "PRINT_ANSWERS_PDF_2UP = [$(PRINT_ANSWERS_PDF_2UP)]"
+	@echo "QUESTION_INSTALL_FILES = [$(QUESTION_INSTALL_FILES)]"
+	@echo "ANSWER_INSTALL_FILES = [$(ANSWER_INSTALL_FILES)]"
 else
 	@echo "WEB_HTML = [$(WEB_HTML)]"
 	@echo "PRINT_TEX = [$(PRINT_TEX)]"
 	@echo "PRINT_PDF_1UP = [$(PRINT_PDF_1UP)]"
 	@echo "PRINT_PDF_2UP = [$(PRINT_PDF_2UP)]"
+	@echo "INSTALL_FILES = [$(INSTALL_FILES)]"
 endif
 	@echo "XSLT_STYLESHEETS = [$(XSLT_STYLESHEETS)]"
 	@echo "PRINT_IMAGES = [$(PRINT_IMAGES)]"