diff --git a/templates/atom/changelogentry.tmpl b/templates/atom/changelogentry.tmpl
--- a/templates/atom/changelogentry.tmpl
+++ b/templates/atom/changelogentry.tmpl
@@ -1,7 +1,7 @@
  <entry>
   <title>{desc|strip|firstline|strip|escape|nonempty}</title>
   <id>{urlbase}{url}#changeset-{node}</id>
-  <link href="{urlbase}{url}rev/{node}"/>
+  <link href="{urlbase}{url}rev/{node|short}"/>
   <author>
    <name>{author|person|escape}</name>
    <email>{author|email|obfuscate}</email>
diff --git a/templates/atom/tagentry.tmpl b/templates/atom/tagentry.tmpl
--- a/templates/atom/tagentry.tmpl
+++ b/templates/atom/tagentry.tmpl
@@ -1,6 +1,6 @@
  <entry>
   <title>{tag|escape}</title>
-  <link rel="alternate" href="{urlbase}{url}rev/{node}"/>
+  <link rel="alternate" href="{urlbase}{url}rev/{node|short}"/>
   <id>{urlbase}{url}#tag-{node}</id>
   <updated>{date|rfc3339date}</updated>
   <published>{date|rfc3339date}</published>
diff --git a/tests/test-hgweb-commands.out b/tests/test-hgweb-commands.out
--- a/tests/test-hgweb-commands.out
+++ b/tests/test-hgweb-commands.out
@@ -17,7 +17,7 @@ 200 Script output follows
  <entry>
   <title>branch</title>
   <id>http://127.0.0.1/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id>
-  <link href="http://127.0.0.1/rev/1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe"/>
+  <link href="http://127.0.0.1/rev/1d22e65f027e"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
@@ -33,7 +33,7 @@ 200 Script output follows
  <entry>
   <title>Added tag 1.0 for changeset 2ef0ac749a14</title>
   <id>http://127.0.0.1/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id>
-  <link href="http://127.0.0.1/rev/a4f92ed23982be056b9852de5dfe873eaac7f0de"/>
+  <link href="http://127.0.0.1/rev/a4f92ed23982"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
@@ -49,7 +49,7 @@ 200 Script output follows
  <entry>
   <title>base</title>
   <id>http://127.0.0.1/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id>
-  <link href="http://127.0.0.1/rev/2ef0ac749a14e4f57a5a822464a0902c6f7f448f"/>
+  <link href="http://127.0.0.1/rev/2ef0ac749a14"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
@@ -78,7 +78,7 @@ 200 Script output follows
  <entry>
   <title>branch</title>
   <id>http://127.0.0.1/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id>
-  <link href="http://127.0.0.1/rev/1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe"/>
+  <link href="http://127.0.0.1/rev/1d22e65f027e"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
@@ -94,7 +94,7 @@ 200 Script output follows
  <entry>
   <title>Added tag 1.0 for changeset 2ef0ac749a14</title>
   <id>http://127.0.0.1/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id>
-  <link href="http://127.0.0.1/rev/a4f92ed23982be056b9852de5dfe873eaac7f0de"/>
+  <link href="http://127.0.0.1/rev/a4f92ed23982"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
@@ -110,7 +110,7 @@ 200 Script output follows
  <entry>
   <title>base</title>
   <id>http://127.0.0.1/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id>
-  <link href="http://127.0.0.1/rev/2ef0ac749a14e4f57a5a822464a0902c6f7f448f"/>
+  <link href="http://127.0.0.1/rev/2ef0ac749a14"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
@@ -137,7 +137,7 @@ 200 Script output follows
  <entry>
   <title>base</title>
   <id>http://127.0.0.1/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id>
-  <link href="http://127.0.0.1/rev/2ef0ac749a14e4f57a5a822464a0902c6f7f448f"/>
+  <link href="http://127.0.0.1/rev/2ef0ac749a14"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
@@ -476,7 +476,7 @@ 200 Script output follows
 
  <entry>
   <title>1.0</title>
-  <link rel="alternate" href="http://127.0.0.1/rev/2ef0ac749a14e4f57a5a822464a0902c6f7f448f"/>
+  <link rel="alternate" href="http://127.0.0.1/rev/2ef0ac749a14"/>
   <id>http://127.0.0.1/#tag-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id>
   <updated>1970-01-01T00:00:00+00:00</updated>
   <published>1970-01-01T00:00:00+00:00</published>
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
@@ -20,7 +20,7 @@ 200 Script output follows
  <entry>
   <title>test</title>
   <id>http://127.0.0.1/#changeset-4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e</id>
-  <link href="http://127.0.0.1/rev/4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e"/>
+  <link href="http://127.0.0.1/rev/4cbec7e6f8c4"/>
   <author>
    <name>Testing</name>
    <email>&#84;&#101;&#115;&#116;&#105;&#110;&#103;</email>
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
@@ -20,7 +20,7 @@ 200 Script output follows
  <entry>
   <title>test</title>
   <id>http://127.0.0.1/#changeset-4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e</id>
-  <link href="http://127.0.0.1/rev/4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e"/>
+  <link href="http://127.0.0.1/rev/4cbec7e6f8c4"/>
   <author>
    <name>Testing</name>
    <email>&#84;&#101;&#115;&#116;&#105;&#110;&#103;</email>
diff --git a/tests/test-hgwebdir.out b/tests/test-hgwebdir.out
--- a/tests/test-hgwebdir.out
+++ b/tests/test-hgwebdir.out
@@ -237,7 +237,7 @@ 200 Script output follows
  <entry>
   <title>a</title>
   <id>http://127.0.0.1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id>
-  <link href="http://127.0.0.1/t/a/rev/8580ff50825a50c8f716709acdf8de0deddcd6ab"/>
+  <link href="http://127.0.0.1/t/a/rev/8580ff50825a"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
@@ -266,7 +266,7 @@ 200 Script output follows
  <entry>
   <title>a</title>
   <id>http://127.0.0.1/t/a/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id>
-  <link href="http://127.0.0.1/t/a/rev/8580ff50825a50c8f716709acdf8de0deddcd6ab"/>
+  <link href="http://127.0.0.1/t/a/rev/8580ff50825a"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>