diff --git a/mercurial/templates/coal/map b/mercurial/templates/coal/map
index eaa8c0cf65..a34b7f5992 100644
--- a/mercurial/templates/coal/map
+++ b/mercurial/templates/coal/map
@@ -94,14 +94,12 @@ filerevchild = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%url
 
 filerename = '{file|escape}@'
 filelogrename = '
-  <tr>
-    <th>base:</th>
-    <td>
-      <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
-        {file|escape}@{node|short}
-      </a>
-    </td>
-  </tr>'
+  <span class="base">
+    base
+    <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
+      {file|escape}@{node|short}
+    </a>
+  </span>'
 fileannotateparent = '
   <tr>
     <td class="metatag">parent:</td>
diff --git a/mercurial/templates/paper/filelogentry.tmpl b/mercurial/templates/paper/filelogentry.tmpl
index 43e068c841..fe4a3a9724 100644
--- a/mercurial/templates/paper/filelogentry.tmpl
+++ b/mercurial/templates/paper/filelogentry.tmpl
@@ -1,5 +1,5 @@
  <tr class="parity{parity}">
   <td class="age">{date|age}</td>
   <td class="author">{author|person}</td>
-  <td class="description"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}</td>
+  <td class="description"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{rename%filelogrename}</td>
  </tr>
diff --git a/mercurial/templates/paper/map b/mercurial/templates/paper/map
index 0ec3707bc5..823c27bfe8 100644
--- a/mercurial/templates/paper/map
+++ b/mercurial/templates/paper/map
@@ -93,14 +93,12 @@ filerevchild = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%url
 
 filerename = '{file|escape}@'
 filelogrename = '
-  <tr>
-    <th>base:</th>
-    <td>
-      <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
-        {file|escape}@{node|short}
-      </a>
-    </td>
-  </tr>'
+  <span class="base">
+    base
+    <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
+      {file|escape}@{node|short}
+    </a>
+  </span>'
 fileannotateparent = '
   <tr>
     <td class="metatag">parent:</td>
diff --git a/mercurial/templates/static/style-coal.css b/mercurial/templates/static/style-coal.css
index 6f633e1308..543ab7b9a2 100644
--- a/mercurial/templates/static/style-coal.css
+++ b/mercurial/templates/static/style-coal.css
@@ -173,6 +173,7 @@ h3 {
 .bigtable .age { width: 6em; }
 .bigtable .author { width: 12em; }
 .bigtable .description { }
+.bigtable .description .base { font-size: 70%; float: right; line-height: 1.66; }
 .bigtable .node { width: 5em; font-family: monospace;}
 .bigtable .lineno { width: 2em; text-align: right;}
 .bigtable .lineno a { color: #999; font-size: smaller; font-family: monospace;}
diff --git a/mercurial/templates/static/style-paper.css b/mercurial/templates/static/style-paper.css
index c3536561e5..886387cbfb 100644
--- a/mercurial/templates/static/style-paper.css
+++ b/mercurial/templates/static/style-paper.css
@@ -164,6 +164,7 @@ h3 {
 .bigtable .age { width: 7em; }
 .bigtable .author { width: 12em; }
 .bigtable .description { }
+.bigtable .description .base { font-size: 70%; float: right; line-height: 1.66; }
 .bigtable .node { width: 5em; font-family: monospace;}
 .bigtable .permissions { width: 8em; text-align: left;}
 .bigtable .size { width: 5em; text-align: right; }