diff --git a/lib/viewcvs.py b/lib/viewcvs.py
index 2f4ba516..a0554bb2 100644
--- a/lib/viewcvs.py
+++ b/lib/viewcvs.py
@@ -2027,9 +2027,6 @@ def view_log(request):
     if rev.co_rev:
       tags.append(_item(rev=rev.co_rev.string, name=tag))
 
-  data['tr1'] = request.query_dict.get('r1') or show_revs[-1].string
-  data['tr2'] = request.query_dict.get('r2') or show_revs[0].string
-
   branch_names = []
   for tag in taginfo.values():
     if tag.is_branch:
diff --git a/templates/include/diff_form.ezt b/templates/include/diff_form.ezt
index 0da0f7a8..4cf45a31 100644
--- a/templates/include/diff_form.ezt
+++ b/templates/include/diff_form.ezt
@@ -19,10 +19,12 @@
     <option value="[tags.rev]:[tags.name]">[tags.name]</option>
   [end]
   </select>
-  <input type="text" size="12" name="tr1" value="[tr1]"
-        onchange="document.diff_select.r1.selectedIndex=0" />
+  <input type="text" size="12" name="tr1" 
+         value="[if-any rev_selected][rev_selected][else][first_revision][end]"
+         onchange="document.diff_select.r1.selectedIndex=0" />
 [else]
-  <input type="text" size="12" name="r1" value="[tr1]" />
+  <input type="text" size="12" name="r1"
+         value="[if-any rev_selected][rev_selected][else][first_revision][end]" />
 [end]
 
   and
@@ -33,10 +35,11 @@
     <option value="[tags.rev]:[tags.name]">[tags.name]</option>
   [end]
   </select>
-  <input type="text" size="12" name="tr2" value="[tr2]"
-        onchange="document.diff_select.r1.selectedIndex=0" />
+  <input type="text" size="12" name="tr2" 
+         value="[last_revision]"
+         onchange="document.diff_select.r1.selectedIndex=0" />
 [else]
-  <input type="text" size="12" name="r2" value="[tr1]" />
+  <input type="text" size="12" name="r2" value="[last_revision]" />
 [end]
   </td>
   </tr>
diff --git a/templates/log.ezt b/templates/log.ezt
index a6b8bfa0..7066497f 100644
--- a/templates/log.ezt
+++ b/templates/log.ezt
@@ -12,7 +12,12 @@
 [include "include/view_tag.ezt"]
 [include "include/paging.ezt"]
 
+[define first_revision][end]
+[define last_revision][end]
+
 [for entries]
+[if-index entries first][define first_revision][entries.rev][end][end]
+[if-index entries last][define last_revision][entries.rev][end][end]
 <div>
   <hr />
 
diff --git a/templates/log_table.ezt b/templates/log_table.ezt
index 48ce1f9d..18cac58f 100644
--- a/templates/log_table.ezt
+++ b/templates/log_table.ezt
@@ -28,7 +28,13 @@
   <th class="vc_header">Author</th>
 </tr>
 </thead>
+
+[define first_revision][end]
+[define last_revision][end]
+
 [for entries]
+[if-index entries first][define first_revision][entries.rev][end][end]
+[if-index entries last][define last_revision][entries.rev][end][end]
   <tbody>
   <tr style="vertical-align: top;" class="vc_row_[if-index entries even]even[else]odd[end]">
 
diff --git a/website/template-authoring-guide.html b/website/template-authoring-guide.html
index 30b5d2e9..88fe50d4 100644
--- a/website/template-authoring-guide.html
+++ b/website/template-authoring-guide.html
@@ -1239,16 +1239,6 @@ th { background: rgb(60%,70%,90%); }
   <td></td>
   <td></td>
 </tr>
-<tr class="varlevel1">
-  <td class="varname">tr1</td>
-  <td></td>
-  <td></td>
-</tr>
-<tr class="varlevel1">
-  <td class="varname">tr2</td>
-  <td></td>
-  <td></td>
-</tr>
 <tr class="varlevel1">
   <td class="varname">view_href</td>
   <td></td>
diff --git a/website/upgrading.html b/website/upgrading.html
index 743f4f71..fccc1811 100644
--- a/website/upgrading.html
+++ b/website/upgrading.html
@@ -197,7 +197,7 @@
           <var>rows.cvs</var>
         </dt>
         <dd>
-          Replaced by <var>entries.errors</var>
+          Replaced by <var>entries.errors</var>.
         </dd>
       </dl>
       <dl>
@@ -206,7 +206,8 @@
           <var>rows.href</var> and <var>rows.rev_href</var>
         </dt>
         <dd>
-          Replaced by <var>entries.log_href</var> and <var>entries.view_href</var>
+          Replaced by <var>entries.log_href</var> 
+          and <var>entries.view_href</var>.
         </dd>
       </dl>
       <dl>
@@ -215,7 +216,7 @@
           <var>no_match</var>
         </dt>
         <dd>
-          Replaced by <var>num_dead</var>
+          Replaced by <var>num_dead</var>.
         </dd>
       </dl>
       <dl>
@@ -232,7 +233,7 @@
         </dt>
         <dd>
           Removed because <var>sortby_*_href</var> variables now set
-          sort directions
+          sort directions.
         </dd>
       </dl>      
       <dl>
@@ -269,7 +270,7 @@
       <dl>
         <dt><code>markup.ezt</code>: <var>path</var>, 
 	<var>filename</var>, and <var>tag</var></dt>
-        <dd>Deemed unneccessary</dd>
+        <dd>Deemed unneccessary</dd>.
       </dl>
       <dl>
         <dt><code>markup.ezt</code>: <var>file_url</var></dt>
@@ -314,7 +315,8 @@
       </dl>
       <dl>
         <dt><code>log.ezt</code> and <code>log_table.ezt</code>:
-        <var>viewable</var> and <var>is_text</var></dt>
+        <var>viewable</var>, <var>tr1</var>, <var>tr2</var>,
+        and <var>is_text</var></dt>
         <dd>
           Deemed unnecessary.
         </dd>