diff --git a/Gemfile b/Gemfile
index ba61a1d1..e53cd598 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,6 @@ end
 gem 'gollum-lib', :git => 'https://github.com/gollum/gollum-lib.git', :branch => 'gollum-lib-5.x' # For development purposes
 gem 'therubyrhino', :platforms => :jruby
 gemspec
-gem "rake", ">= 12.3.3"
 
+gem "rake", '~> 12.3', '>= 12.3.3'
 
diff --git a/lib/gollum/views/page.rb b/lib/gollum/views/page.rb
index c992db2f..0d719d9c 100644
--- a/lib/gollum/views/page.rb
+++ b/lib/gollum/views/page.rb
@@ -18,7 +18,7 @@ module Precious
 
       def title
         h1 = @h1_title ? page_header_from_content(@content) : false
-        h1 || @page.title
+        h1 || @page.url_path_title # url_path_title is the metadata title if present, otherwise the filename-based title
       end
 
       def page_header