diff --git a/Repositories/otago_eprints/Makefile b/Repositories/otago_eprints/Makefile
index e8b7587..3ed514f 100755
--- a/Repositories/otago_eprints/Makefile
+++ b/Repositories/otago_eprints/Makefile
@@ -1,13 +1,27 @@
 SHELL=/bin/sh
 
-DEPLOY_ROOT=/usr/lcoal/eprints/archives
-DEPLOY_DIR=$(DEPLOY_DIR)/otago_eprints
+ARCHIVE_NAME:=otago_eprints
 
-.PHONY: deploy
+EPRINTS:=/usr/local/eprints
+ARCHIVE_ROOT:=$(EPRINTS)/archives/$(ARCHIVE_NAME)
+ARCHIVE_CONFIG:=$(EPRINTS)/archives/$(ARCHIVE_NAME).xml
 
-deploy: otago_eprints.xml
-	sudo -u www cp $< /usr/local/eprints/archives
-	sudo -u www chown www:www /usr/local/eprints/archives/$<
-	sudo -u www /usr/local/eprints/bin/generate_apacheconf
+
+.PHONY: deploy restart
+
+
+deploy:
+	@sudo rsync --verbose --cvs-exclude --exclude=Makefile --recursive --times . $(EPRINTS)/archives
+	sudo chown -R www:www $(ARCHIVE_CONFIG) $(ARCHIVE_ROOT)
+
+
+restart:
 	sudo /usr/sbin/apachectl stop
-	sudo /usr/sbin/apachectl start
+	while [ -f /var/run/httpd/pid ]; do; done
+
+
+debug:
+	@echo "ARCHIVE_NAME = [$(ARCHIVE_NAME)]"
+	@echo "EPRINTS = [$(EPRINTS)]"
+	@echo "ARCHIVE_ROOT = [$(ARCHIVE_ROOT)]"
+	@echo "ARCHIVE_CONFIG = [$(ARCHIVE_CONFIG)]"