diff --git a/authority/static/.well-known/host-meta b/authority/static/.well-known/host-meta
index 892325f31405e41b9edb14a6139e4c570e379513..f96a548972c015172efab6b25ddec3f5c5ec8d4f 100644
--- a/authority/static/.well-known/host-meta
+++ b/authority/static/.well-known/host-meta
@@ -3,7 +3,7 @@
 <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0' 
      xmlns:hm='http://host-meta.net/xrd/1.0'>
 
-  <hm:Host xmlns='http://host-meta.net/xrd/1.0'>127.0.0.1:56080</hm:Host>
+  <hm:Host xmlns='http://host-meta.net/xrd/1.0'>authority.mozilla.org</hm:Host>
 
   <Link rel='lrdd' template='http://authority.mozilla.org/users/{uri}.xml'></Link>
 
diff --git a/run.js b/run.js
index c797b49404036bf4bc9b4d1cc7eb0c76741ede44..42da0e40f86b80f70fc1a3f46391c45e6cb5e3e4 100644
--- a/run.js
+++ b/run.js
@@ -66,7 +66,7 @@ function serveFile(filename, response) {
         var a = o.server.address();
         var from = o.name + ".mozilla.org";
         var to = a.address + ":" + a.port;
-        data = data.replace(from, to);
+        data = data.replace(new RegExp(from, 'g'), to);
       }
 
       response.writeHead(200, {"Content-Type": mimeType});