diff --git a/lib/gollum/page.rb b/lib/gollum/page.rb
index 175f49cc..6519062a 100644
--- a/lib/gollum/page.rb
+++ b/lib/gollum/page.rb
@@ -150,10 +150,20 @@ module Gollum
     # options - The options Hash:
     #           :page     - The Integer page number (default: 1).
     #           :per_page - The Integer max count of items to return.
+    #           :follow   - Follow's a file across renames, but falls back 
+    #                       to a slower Grit native call.  (default: true)
     #
     # Returns an Array of Grit::Commit.
     def versions(options = {})
-      @wiki.repo.log('master', @path, log_pagination_options(options))
+      options[:follow] = true if !options.key?(:follow)
+      options = log_pagination_options(options)
+      if options[:follow]
+        options[:pretty] = 'raw'
+        log = @wiki.repo.git.native "log", options, "master", "--", @path
+        Grit::Commit.list_from_string(@wiki.repo, log)
+      else
+        @wiki.repo.log('master', @path, options)
+      end
     end
 
     # Public: The footer Page.
diff --git a/test/examples/lotr.git/objects/0a/de1e2916346d4c1f2fb63b863fd3c16808fe44 b/test/examples/lotr.git/objects/0a/de1e2916346d4c1f2fb63b863fd3c16808fe44
new file mode 100644
index 00000000..59c822e2
Binary files /dev/null and b/test/examples/lotr.git/objects/0a/de1e2916346d4c1f2fb63b863fd3c16808fe44 differ
diff --git a/test/examples/lotr.git/objects/2c/b9156ad383914561a8502fc70f5a1d887e48ad b/test/examples/lotr.git/objects/2c/b9156ad383914561a8502fc70f5a1d887e48ad
new file mode 100644
index 00000000..cc4a8f47
--- /dev/null
+++ b/test/examples/lotr.git/objects/2c/b9156ad383914561a8502fc70f5a1d887e48ad
@@ -0,0 +1,4 @@
+x���A��0�9�WX�À4ۑ8�� ���0�CU���m��q�d����ق���K��{/����������G�{ѹWG�i �U�8&��V*�/Rל�
+0��>
+L8R����L��pXG���y<+�8�qi��2��/���d	�\�_8�ϝŏL��v:	��e�U=&��Fwc3L���f'�:�$��Ne2ܖ���B��4��$~���>8'�U�Džn
|R�E���
+[,�pFO�p����h�5�*�z�X��Yx�ů+6Y�;���{�.Y���)Y�u�Œ޴��e%ϳ��.��_&�8�Qd��߆=�6����!�%
f�uf�5�]�.�7��֛��y9�48(�<S�X���|:���^~������+�����
\ No newline at end of file
diff --git a/test/examples/lotr.git/objects/5d/cac289a8603188d2c5caf481dcba2985126aaa b/test/examples/lotr.git/objects/5d/cac289a8603188d2c5caf481dcba2985126aaa
new file mode 100644
index 00000000..ffca36dd
Binary files /dev/null and b/test/examples/lotr.git/objects/5d/cac289a8603188d2c5caf481dcba2985126aaa differ
diff --git a/test/examples/lotr.git/objects/60/f12f4254f58801b9ee7db7bca5fa8aeefaa56b b/test/examples/lotr.git/objects/60/f12f4254f58801b9ee7db7bca5fa8aeefaa56b
new file mode 100644
index 00000000..ef22400a
Binary files /dev/null and b/test/examples/lotr.git/objects/60/f12f4254f58801b9ee7db7bca5fa8aeefaa56b differ
diff --git a/test/examples/lotr.git/objects/71/4323c104239440a5c66ab12a67ed07a83c404f b/test/examples/lotr.git/objects/71/4323c104239440a5c66ab12a67ed07a83c404f
new file mode 100644
index 00000000..163ce2ed
Binary files /dev/null and b/test/examples/lotr.git/objects/71/4323c104239440a5c66ab12a67ed07a83c404f differ
diff --git a/test/examples/lotr.git/objects/93/6b83ee0dd8837adb82511e40d5e4ebe59bb675 b/test/examples/lotr.git/objects/93/6b83ee0dd8837adb82511e40d5e4ebe59bb675
new file mode 100644
index 00000000..7dd6c7d3
Binary files /dev/null and b/test/examples/lotr.git/objects/93/6b83ee0dd8837adb82511e40d5e4ebe59bb675 differ
diff --git a/test/examples/lotr.git/objects/c3/b43e9f08966b088e7a0192e436b7a884542e05 b/test/examples/lotr.git/objects/c3/b43e9f08966b088e7a0192e436b7a884542e05
new file mode 100644
index 00000000..a0cc0c9b
Binary files /dev/null and b/test/examples/lotr.git/objects/c3/b43e9f08966b088e7a0192e436b7a884542e05 differ
diff --git a/test/examples/lotr.git/objects/ec/da3205bee14520aab5a7bb307392064b938e83 b/test/examples/lotr.git/objects/ec/da3205bee14520aab5a7bb307392064b938e83
new file mode 100644
index 00000000..0368df60
Binary files /dev/null and b/test/examples/lotr.git/objects/ec/da3205bee14520aab5a7bb307392064b938e83 differ
diff --git a/test/examples/lotr.git/objects/fa/e7ef5344202bba4129abdc13060d9297d99465 b/test/examples/lotr.git/objects/fa/e7ef5344202bba4129abdc13060d9297d99465
new file mode 100644
index 00000000..88255e27
--- /dev/null
+++ b/test/examples/lotr.git/objects/fa/e7ef5344202bba4129abdc13060d9297d99465
@@ -0,0 +1,3 @@
+x���
+�0=�+�r�^�&4 Rz�ȦY�YH���O30�zX{<Dk�"�<�n�apQ*��褝����
�HL%���
�<J��Ur]h��ߒ��c
+�R+�{�[�?~*A
\ No newline at end of file
diff --git a/test/examples/lotr.git/refs/heads/master b/test/examples/lotr.git/refs/heads/master
index bc3dd288..3f114d47 100644
--- a/test/examples/lotr.git/refs/heads/master
+++ b/test/examples/lotr.git/refs/heads/master
@@ -1 +1 @@
-0ed8cbe0a25235bd867e65193c7d837c66b328ef
+60f12f4254f58801b9ee7db7bca5fa8aeefaa56b
\ No newline at end of file
diff --git a/test/test_page.rb b/test/test_page.rb
index 018437a9..a1e76950 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -36,6 +36,18 @@ context "Page" do
       page.versions.map { |v| v.id }
   end
 
+  test "page versions across renames" do
+    page = @wiki.page 'My-Precious'
+    assert_equal ['60f12f4254f58801b9ee7db7bca5fa8aeefaa56b', '94523d7ae48aeba575099dd12926420d8fd0425d'],
+      page.versions.map { |v| v.id }
+  end
+
+  test "page versions without renames" do
+    page = @wiki.page 'My-Precious'
+    assert_equal ['60f12f4254f58801b9ee7db7bca5fa8aeefaa56b'],
+      page.versions(:follow => false).map { |v| v.id }
+  end
+
   test "specific page version" do
     page = @wiki.page('Bilbo Baggins', 'fbabba862dfa7ac35b39042dd4ad780c9f67b8cb')
     assert_equal 'fbabba862dfa7ac35b39042dd4ad780c9f67b8cb', page.version.id
@@ -67,7 +79,7 @@ context "Page" do
   end
 
   test "title from filename with html contents" do
-    page = @wiki.page('My <b>Precious')
+    page = @wiki.page('My <b>Precious', '0ed8cbe0a25235bd867e65193c7d837c66b328ef')
     assert_equal 'My Precious', page.title
   end
 
diff --git a/test/test_wiki.rb b/test/test_wiki.rb
index bdd64416..086b1793 100644
--- a/test/test_wiki.rb
+++ b/test/test_wiki.rb
@@ -35,7 +35,7 @@ context "Wiki" do
   test "list pages" do
     pages = @wiki.pages
     assert_equal \
-      %w(Bilbo-Baggins.md Eye-Of-Sauron.md Home.textile My-<b>Precious.md), 
+      %w(Bilbo-Baggins.md Eye-Of-Sauron.md Home.textile My-Precious.md), 
       pages.map { |p| p.filename }.sort
   end
 end