diff --git a/Repositories/otago_eprints/Makefile b/Repositories/otago_eprints/Makefile
index a721766..f7898c3 100755
--- a/Repositories/otago_eprints/Makefile
+++ b/Repositories/otago_eprints/Makefile
@@ -21,7 +21,8 @@
 include environment_config.make
 
 
-SUBSTITUTIONS:=EPRINTS_HOST EPRINTS_PORT EPRINTS_ADMIN_EMAIL EPRINTS_ARCHIVE_NAME
+CONFIG_SUBS:=EPRINTS_HOST EPRINTS_PORT EPRINTS_ADMIN_EMAIL EPRINTS_ARCHIVE_NAME
+VHOST_SUBS:=EPRINTS_ALLOWED_DOMAINS
 
 ARCHIVE_NAME:=otago_eprints
 
@@ -56,12 +57,12 @@
 
 $(ARCHIVE_NAME).xml: $(ARCHIVE_NAME)_src.xml
 	@announce "Creating $@"
-	perl -p $(foreach SUB,$(SUBSTITUTIONS),-e "s/##$(SUB)##/$($(SUB))/;") $< > $@
+	perl -p $(foreach SUB,$(CONFIG_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@
 
 
 $(ARCHIVE_NAME)/cfg/apachevhost.conf: $(ARCHIVE_NAME)/cfg/apachevhost_src.conf
 	@announce "Creating $@"
-	perl -p -e "s|##EPRINTS_ALLOWED_DOMAINS##|$(EPRINTS_ALLOWED_DOMAINS)|;"  $< > $@
+	perl -p $(foreach SUB,$(VHOST_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@
 
 
 generate_apacheconf: