diff --git a/lib/jekyll/tagging.rb b/lib/jekyll/tagging.rb
index 2637751..0ef3be1 100644
--- a/lib/jekyll/tagging.rb
+++ b/lib/jekyll/tagging.rb
@@ -106,6 +106,8 @@ def initialize(site, base, dir, name, data = {})
       self.content = data.delete('content') || ''
       self.data    = data
 
+      self.data['title'] = site.layouts[site.config['tag_page_layout']].data['title'] || site.config['tag_page_title'] || "Tag #{data['tag']}"
+
       super(site, base, dir[-1, 1] == '/' ? dir : '/' + dir, name)
     end