diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/BlameDetail.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/BlameDetail.soy
index 2bf0a30..28e87ef 100644
--- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/BlameDetail.soy
+++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/BlameDetail.soy
@@ -46,7 +46,7 @@
   <table id="blame">
     {foreach $line in $data.lines}
       {let $i: index($line) /}
-      {let $region: $regions[index($line)] /}
+      {let $region: $regions[$i] /}
       <tr class="{$region.class}">
         {if isNonnull($region.abbrevSha)}
           <td class="author">{$region.author.name}</td>
@@ -61,7 +61,8 @@
         {else}
           <td colspan="3"></td>
         {/if}
-        <td class="linenum">{index($line) + 1}.</td>
+        {let $n: $i + 1 /}
+        <td class="linenum"><a name="{$n}"></a>{$n}.</td>
         <td class="prettyprint">
           {foreach $span in $line}
             <span class="{$span.classes}">{$span.text}</span>
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/ObjectDetail.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/ObjectDetail.soy
index e3f6a2a..badf0cb 100644
--- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/ObjectDetail.soy
+++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/ObjectDetail.soy
@@ -244,6 +244,7 @@
       <ol class="prettyprint">
         {foreach $line in $lines}
           <li>
+            <a name="{index($line) + 1}"></a>
             {foreach $span in $line}
               <span class="{$span.classes}">{$span.text}</span>
             {/foreach}