diff --git a/src/IDF/Scm/Git.php b/src/IDF/Scm/Git.php
index acb57ed..9824644 100644
--- a/src/IDF/Scm/Git.php
+++ b/src/IDF/Scm/Git.php
@@ -75,7 +75,12 @@ class IDF_Scm_Git extends IDF_Scm
         }
         $res = array();
         foreach ($out as $b) {
-            $res[substr($b, 2)] = '';
+            $b = substr($b, 2);
+            if (false !== strpos($b, '/')) {
+                $res[$this->getCommit($b)->commit] = $b;
+            } else {
+                $res[$b] = '';
+            }
         }
         $this->cache['branches'] = $res;
         return $res;
diff --git a/src/IDF/Views/Source.php b/src/IDF/Views/Source.php
index 334ffe8..2f0d5c7 100644
--- a/src/IDF/Views/Source.php
+++ b/src/IDF/Views/Source.php
@@ -94,7 +94,7 @@ class IDF_Views_Source
         $rchanges = new Pluf_Template_ContextVars($rchanges);
         $scmConf = $request->conf->getVal('scm', 'git');
         $in_branches = $scm->inBranches($commit, '');
-        return Pluf_Shortcuts_RenderToResponse('idf/source/changelog.html',
+        return Pluf_Shortcuts_RenderToResponse('idf/source/'.$scmConf.'/changelog.html',
                                                array(
                                                      'page_title' => $title,
                                                      'title' => $title,
diff --git a/src/IDF/templates/idf/source/changelog.html b/src/IDF/templates/idf/source/changelog.html
index 4a9a77e..971d3ba 100644
--- a/src/IDF/templates/idf/source/changelog.html
+++ b/src/IDF/templates/idf/source/changelog.html
@@ -27,23 +27,3 @@
 </tbody>
 </table>
 {/block}
-
-{block context}
-{if $scm != 'svn'}
-<p><strong>{trans 'Branches:'}</strong><br />
-{foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />
-{/foreach}
-</p>
-{else}
-<form class="star" action="{url 'IDF_Views_Source_Svn::changelogRev', array($project.shortname)}" method="get">
-<p><strong>{trans 'Revision:'}</strong> {$commit}</p>
-<p>
-    <input accesskey="4" type="text" value="{$commit}" name="rev" size="5" />
-    <input type="submit" name="s" value="{trans 'Go to revision'}" />
-</p>
-</form>
-{/if}
-{/block}
-
diff --git a/src/IDF/templates/idf/source/git/changelog.html b/src/IDF/templates/idf/source/git/changelog.html
new file mode 100644
index 0000000..8c3ceb9
--- /dev/null
+++ b/src/IDF/templates/idf/source/git/changelog.html
@@ -0,0 +1,10 @@
+{extends "idf/source/changelog.html"}
+{block context}
+<p><strong>{trans 'Branches:'}</strong><br />
+{foreach $branches as $branch => $path}
+{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
+<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$branch}{/if}</a></span><br />
+{/foreach}
+</p>
+{/block}
+
diff --git a/src/IDF/templates/idf/source/git/file.html b/src/IDF/templates/idf/source/git/file.html
index d2343bf..76e9b75 100644
--- a/src/IDF/templates/idf/source/git/file.html
+++ b/src/IDF/templates/idf/source/git/file.html
@@ -25,7 +25,7 @@
 <p><strong>{trans 'Branches:'}</strong><br />
 {foreach $branches as $branch => $path}
 {aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />
+<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$branch}{/if}</a></span><br />
 {/foreach}
 </p>
 {/block}
diff --git a/src/IDF/templates/idf/source/git/tree.html b/src/IDF/templates/idf/source/git/tree.html
index b97db05..8bc8a68 100644
--- a/src/IDF/templates/idf/source/git/tree.html
+++ b/src/IDF/templates/idf/source/git/tree.html
@@ -55,7 +55,7 @@
 <p><strong>{trans 'Branches:'}</strong><br />
 {foreach $branches as $branch => $path}
 {aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />
+<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$branch}{/if}</a></span><br />
 {/foreach}
 </p>
 {/block}
diff --git a/src/IDF/templates/idf/source/mercurial/changelog.html b/src/IDF/templates/idf/source/mercurial/changelog.html
new file mode 100644
index 0000000..6557c89
--- /dev/null
+++ b/src/IDF/templates/idf/source/mercurial/changelog.html
@@ -0,0 +1,10 @@
+{extends "idf/source/changelog.html"}
+{block context}
+<p><strong>{trans 'Branches:'}</strong><br />
+{foreach $branches as $branch => $path}
+{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
+<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />
+{/foreach}
+</p>
+{/block}
+
diff --git a/src/IDF/templates/idf/source/svn/changelog.html b/src/IDF/templates/idf/source/svn/changelog.html
new file mode 100644
index 0000000..b535e5c
--- /dev/null
+++ b/src/IDF/templates/idf/source/svn/changelog.html
@@ -0,0 +1,11 @@
+{extends "idf/source/changelog.html"}
+{block context}
+<form class="star" action="{url 'IDF_Views_Source_Svn::changelogRev', array($project.shortname)}" method="get">
+<p><strong>{trans 'Revision:'}</strong> {$commit}</p>
+<p>
+    <input accesskey="4" type="text" value="{$commit}" name="rev" size="5" />
+    <input type="submit" name="s" value="{trans 'Go to revision'}" />
+</p>
+</form>
+{/block}
+