diff --git a/Repositories/otago_eprints/Makefile b/Repositories/otago_eprints/Makefile
index 3ffe84c..f211d88 100755
--- a/Repositories/otago_eprints/Makefile
+++ b/Repositories/otago_eprints/Makefile
@@ -14,13 +14,30 @@
 
 deploy:
 	@sudo rsync --verbose --cvs-exclude --exclude=Makefile --recursive \
-		--times --delete --delete-excluded . $(EPRINTS)/archives
+		--times --delete --delete-excluded . $(EPRINTS)/archives > rsync-output
 	sudo chown -R www:www $(ARCHIVE_CONFIG) $(ARCHIVE_ROOT)
+	@-grep --quiet "$(ARCHIVE_NAME)\\.xml" rsync-output && $(MAKE) generate_apacheconf
+	@-grep --quiet "$(ARCHIVE_NAME)/cfg/subjects" rsync-output && $(MAKE) import_subjects
+	@-grep --quiet "\\(otago_eprints/cfg/static/\\)\\|\\(\\.xml\\)" rsync-output && $(MAKE) generate_static
+	@-grep --quiet "\\(\\.pm\\)\\|\\(\\.xml\\)\|\($(ARCHIVE_NAME)/cfg/subjects\)" rsync-output && $(MAKE) generate_views
+	@-grep --quiet "$(ARCHIVE_NAME)/cfg/ArchiveRenderConfig.pm" rsync-output && $(MAKE) generate_abstracts
+	@-grep --quiet "\\(\\.pm\\)\\|\\(\\.xml\\)" rsync-output && $(MAKE) restart_apache
+	@rm -f rsync-output
 
 
-restart:
-	sudo /usr/sbin/apachectl stop
-	while [ -f /var/run/httpd/pid ]; do; done
+generate_apacheconf:
+	@sudo -u www $(BINDIR)/$@
+
+import_subjects generate_static generate_abstracts generate_views:
+	@sudo -u www $(BINDIR)/$@ $(ARCHIVE_NAME)
+
+restart_apache:
+	@echo "Waiting for Apache to shut down..."
+	@sudo /usr/sbin/apachectl stop
+	@while [ -f /var/run/httpd.pid ]; do echo > /dev/null; done
+	@echo "Waiting for Apache to start up..."
+	@sudo /usr/sbin/apachectl start
+	@while [ ! -f /var/run/httpd.pid ]; do echo > /dev/null; done
 
 
 debug: