diff --git a/templates/results.html b/templates/results.html
index ca13f82..5decfea 100644
--- a/templates/results.html
+++ b/templates/results.html
@@ -56,6 +56,10 @@ which contains *all* Project Gutenberg metadata in one RDF/XML file.
 	  rel="next"
 	  title="Next Page"
 	  href="${os.url ('search', start_index = os.next_page_index)}" />
+	<link py:if="os.show_next_page_link"
+	  rel="last"
+	  title="Last Page"
+	  href="${os.url ('search', start_index = os.last_page_index)}" />
 
     <meta name="totalResults" content="${os.total_results}" />
     <meta name="startIndex"   content="${os.start_index}" />
diff --git a/templates/site-layout.html b/templates/site-layout.html
index e07a774..5604a77 100644
--- a/templates/site-layout.html
+++ b/templates/site-layout.html
@@ -149,6 +149,11 @@
 	 accesskey="+"
 	 href="${os.url_carry (start_index = os.next_page_index)}">Next</a>
       </py:if>
+      <py:if test="os.show_next_page_link">|
+      <a title="Go to the last page of results."
+	 accesskey="+"
+	 href="${os.url_carry (start_index = os.last_page_index)}">Next</a>
+      </py:if>
     </span>
   </py:def>