diff --git a/templates/atom/changelogentry.tmpl b/templates/atom/changelogentry.tmpl
--- a/templates/atom/changelogentry.tmpl
+++ b/templates/atom/changelogentry.tmpl
@@ -1,6 +1,6 @@
  <entry>
   <title>#desc|strip|firstline|strip|escape#</title>
-  <id>http://www.selenic.com/mercurial/#changeset-{node}</id>
+  <id>{urlbase}{url}#changeset-{node}</id>
   <link href="{urlbase}{url}rev/{node}"/>
   <author>
    <name>#author|person|escape#</name>
diff --git a/templates/atom/tagentry.tmpl b/templates/atom/tagentry.tmpl
--- a/templates/atom/tagentry.tmpl
+++ b/templates/atom/tagentry.tmpl
@@ -1,7 +1,7 @@
  <entry>
   <title>#tag|escape#</title>
   <link rel="alternate" href="{urlbase}{url}rev/{node}"/>
-  <id>http://www.selenic.com/mercurial/#tag-{node}</id>
+  <id>{urlbase}{url}#tag-{node}</id>
   <updated>#date|rfc3339date#</updated>
   <published>#date|rfc3339date#</published>
   <content type="text">#tag|strip|escape#</content>
diff --git a/tests/test-hgweb-commands.out b/tests/test-hgweb-commands.out
index 5f2276e3ec44958a9d941a55470f7ccbc05035f1..e32a78485342f8c548bec6855c6d2794f113ba54
GIT binary patch
literal 24214
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

diff --git a/tests/test-hgweb-no-path-info.out b/tests/test-hgweb-no-path-info.out
--- a/tests/test-hgweb-no-path-info.out
+++ b/tests/test-hgweb-no-path-info.out
@@ -19,7 +19,7 @@ 200 Script output follows
 
  <entry>
   <title>test</title>
-  <id>http://www.selenic.com/mercurial/#changeset-4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e</id>
+  <id>http://127.0.0.1/#changeset-4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e</id>
   <link href="http://127.0.0.1/rev/4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e"/>
   <author>
    <name>Testing</name>
diff --git a/tests/test-hgweb-no-request-uri.out b/tests/test-hgweb-no-request-uri.out
--- a/tests/test-hgweb-no-request-uri.out
+++ b/tests/test-hgweb-no-request-uri.out
@@ -19,7 +19,7 @@ 200 Script output follows
 
  <entry>
   <title>test</title>
-  <id>http://www.selenic.com/mercurial/#changeset-4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e</id>
+  <id>http://127.0.0.1/#changeset-4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e</id>
   <link href="http://127.0.0.1/rev/4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e"/>
   <author>
    <name>Testing</name>
diff --git a/tests/test-hgwebdir.out b/tests/test-hgwebdir.out
--- a/tests/test-hgwebdir.out
+++ b/tests/test-hgwebdir.out
@@ -64,7 +64,7 @@ 200 Script output follows
 
  <entry>
   <title>a</title>
-  <id>http://127.0.0.1/mercurial/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id>
+  <id>http://127.0.0.1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id>
   <link href="http://127.0.0.1/t/a/rev/8580ff50825a50c8f716709acdf8de0deddcd6ab"/>
   <author>
    <name>test</name>
@@ -93,7 +93,7 @@ 200 Script output follows
 
  <entry>
   <title>a</title>
-  <id>http://127.0.0.1/mercurial/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id>
+  <id>http://127.0.0.1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id>
   <link href="http://127.0.0.1/t/a/rev/8580ff50825a50c8f716709acdf8de0deddcd6ab"/>
   <author>
    <name>test</name>