diff --git a/middleman-templates/lib/middleman-templates/default/source/layouts/layout.erb b/middleman-templates/lib/middleman-templates/default/source/layouts/layout.erb
index 365985b7..fffa9ad9 100644
--- a/middleman-templates/lib/middleman-templates/default/source/layouts/layout.erb
+++ b/middleman-templates/lib/middleman-templates/default/source/layouts/layout.erb
@@ -2,18 +2,18 @@
 <html>
   <head>
     <meta charset="utf-8">
-    
+
     <!-- Always force latest IE rendering engine or request Chrome Frame -->
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
-    
+
     <!-- Use title if it's in the page YAML frontmatter -->
-    <title><%= data.page.title || "The Middleman" %></title>
-    
+    <title><%= current_page.data.title || "The Middleman" %></title>
+
     <%= stylesheet_link_tag "normalize", "all" %>
     <%= javascript_include_tag  "all" %>
   </head>
-  
+
   <body class="<%= page_classes %>">
     <%= yield %>
   </body>
-</html>
\ No newline at end of file
+</html>
