diff --git a/lib/middleman/features/blog.rb b/lib/middleman/features/blog.rb
index 759da01e..0f2467c0 100644
--- a/lib/middleman/features/blog.rb
+++ b/lib/middleman/features/blog.rb
@@ -4,23 +4,27 @@ module Middleman
   module Features
     module Blog
       class << self
-        def registered(app)          
+        def registered(app)
           # Include helpers
           app.helpers Middleman::Features::Blog::Helpers
-          
+
           app.after_feature_init do
             if !app.settings.respond_to? :blog_permalink
               app.set :blog_permalink, "/:year/:month/:day/:title.html"
             end
-            
+
+            if !app.settings.respond_to? :blog_taglink
+              app.set :blog_taglink, "/tags/:tag.html"
+            end
+
             if !app.settings.respond_to? :blog_layout
               app.set :blog_layout, "layout"
             end
-            
+
             if !app.settings.respond_to? :blog_summary_separator
               app.set :blog_summary_separator, /READMORE/
             end
-            
+
             if !app.settings.respond_to? :blog_summary_length
               app.set :blog_summary_length, 250
             end
@@ -32,44 +36,60 @@ module Middleman
             if !app.settings.respond_to? :blog_index_template
               app.set :blog_index_template, "index_template"
             end
-            
+
             if !app.settings.respond_to? :blog_article_template
               app.set :blog_article_template, "article_template"
             end
-            
+
             $stderr.puts "== Blog: #{app.settings.blog_permalink}"
-            
+
             articles_glob = File.join(app.views, app.settings.blog_permalink.gsub(/(:\w+)/, "*") + ".*")
-            
+
             articles = Dir[articles_glob].map do |article|
               template_content = File.read(article)
               data, content = parse_front_matter(template_content)
               data["date"] = Date.parse(data["date"])
-              
+
               yaml_regex = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
               data["raw"]  = template_content.split(yaml_regex).last
               data["url"] = article.gsub(app.views, "").split(".html").first + ".html"
-              
-              all_content = Tilt.new(article).render              
+
+              all_content = Tilt.new(article).render
               data["body"] = all_content.gsub!(app.settings.blog_summary_separator, "")
-              
+
               sum = if data["raw"] =~ app.settings.blog_summary_separator
                 data["raw"].split(app.settings.blog_summary_separator).first
-              else                data["raw"].match(/(.{1,#{app.settings.blog_summary_length}}.*?)(\n|\Z)/m).to_s
+              else
+                data["raw"].match(/(.{1,#{app.settings.blog_summary_length}}.*?)(\n|\Z)/m).to_s
               end
-              
+
               engine = RDiscount.new(sum)
               data["summary"] = engine.to_html
               data
-            end.sort { |a, b| b["date"] <=> a["date"] }  
-            
-            app.data_content("blog", { :articles => articles })
-            
+            end.sort { |a, b| b["date"] <=> a["date"] }
+
+            tags = {}
+            articles.each do |article|
+              article["tags"] ||= ""
+              if !article["tags"].empty?
+                tags_array = article["tags"].split(',').map{|t| t.strip}
+                tags_array.each do |tag_title|
+                  tag_key = tag_title.parameterize
+                  tag_path = blog_taglink.gsub(/(:\w+)/, tag_key)
+                  (tags[tag_path] ||= {})["title"] = tag_title
+                  tags[tag_path]["ident"] = tag_key
+                  (tags[tag_path]["pages"] ||= {})[article["title"]] = article["url"]
+                end
+              end
+            end
+
+            app.data_content("blog", { :articles => articles, :tags => tags })
+
             app.get(app.settings.blog_permalink) do
               options = {}
               options[:layout] = settings.blog_layout
               options[:layout_engine] = settings.blog_layout_engine
-              
+
               extensionless_path, template_engine = resolve_template(request.path)
 
               full_file_path = "#{extensionless_path}.#{template_engine}"
@@ -78,40 +98,70 @@ module Middleman
 
               # Forward remaining data to helpers
               self.class.data_content("page", data)
-              
+
               output = render(request.path, options)
-              
+
               # No need for separator on permalink page
               output.gsub!(settings.blog_summary_separator, "")
-              
+
               status 200
               output
             end
+
           end
-          
         end
         alias :included :registered
       end
-      
+
       module Helpers
         def is_blog_article?
           !current_article_title.blank?
         end
-        
+
         def blog_title
         end
-        
+
         def current_article_date
           DateTime.parse(current_article_metadata.date)
         end
-        
+
         def current_article_title
           current_article_metadata.title
         end
-        
+
         def current_article_metadata
           data.page
         end
+
+        def current_article_tags
+          article_tags_hash = {}
+          if is_blog_article? && current_article_metadata.tags
+            article_tags = current_article_metadata.tags.split(',').map{|t| t.strip}
+            article_tags.each do |tag_title|
+              article_tags_hash[tag_title] = self.class.blog_taglink.gsub(/(:\w+)/, tag_title.parameterize)
+            end
+          end
+          article_tags_hash
+        end
+
+        def blog_tags
+          data.blog.tags
+        end
+
+        def current_tag_data
+          data.blog.tags[request.path]
+        end
+
+        def current_tag_articles
+          data.blog.articles.map do |article|
+            article if current_tag_data.pages.has_value?(article.url)
+          end.compact
+        end
+
+        def current_tag_title
+          current_tag_data[:title]
+        end
+
       end
     end
   end