diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index 7c5c5802..a8483307 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -28,6 +28,10 @@ module Jekyll
 
       self.process(name)
       self.read_yaml(File.join(base, dir), name)
+
+      self.data.default_proc = proc do |hash, key|
+        self.site.frontmatter_defaults.find(File.join(dir, name), self.type, key)
+      end
     end
 
     def type
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index 8d4418e4..f1a3a6a9 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -55,6 +55,10 @@ module Jekyll
       self.process(name)
       self.read_yaml(@base, name)
 
+      self.data.default_proc = proc do |hash, key|
+        self.site.frontmatter_defaults.find(File.join(dir, name), self.type, key)
+      end
+
       if self.data.has_key?('date')
         self.date = Time.parse(self.data["date"].to_s)
       end