diff --git a/_plugins/category_feeds.rb b/_plugins/category_feeds.rb
new file mode 100644
index 0000000..aed3e03
--- /dev/null
+++ b/_plugins/category_feeds.rb
@@ -0,0 +1,154 @@
+# encoding: utf-8
+#
+# Jekyll category feeds.
+# https://github.com/MrWerewolf/jekyll-category-feeds
+#
+# Copyright (c) 2012 Ryan Seto <mr.werewolf@gmail.com>
+# Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
+#
+# Place this script into the _plugins directory of your Jekyll site.
+#
+require 'atom/feed'
+require 'uri'
+require 'nokogiri'
+
+module Jekyll
+
+  # Represents a feed to be generated.
+  class FeedFile < StaticFile
+    def initialize(site, base, dir, name, posts, category = nil)
+      @site = site
+      @base = base
+      @dir  = dir
+      @name = name
+      @posts = posts
+      @category = category
+    end
+
+    def url
+      return @url if @url
+
+      url = '/' + @dir.gsub(/\/\//, "/") + '/' + @name
+
+      # sanitize url
+      @url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/')
+      @url = URI.escape(@url)
+      @url
+    end
+
+    def write(dest)
+      dest_path = destination(dest)
+
+      feed = self.createFeed
+
+      FileUtils.mkdir_p(File.dirname(dest_path))
+      File.open(dest_path, 'w') { |f| f.write(feed.to_s) }
+
+      true
+    end
+
+    # Creates our feed using the Atom library.
+    def createFeed
+      feed = Atom::Feed.new self.url
+      feed.id = "#{@site.config['url']}/"
+      feed.title = @site.config['name']
+      feed.title = "#{feed.title} >> #{@category}" if @category
+      feed.subtitle = @site.config['tagline'] if @site.config['tagline']
+      feed.updated = Time.now
+
+      # Link to self
+      link_self = feed.links.new
+      link_self.rel = 'self'
+      link_self.href = self.url
+
+      # Alternate link
+      link_alt = feed.links.new
+      link_alt.href = "#{URI.escape(@site.config['url'])}/"
+
+      # (Site) Author info
+      if @site.config['author']
+        author = feed.authors.new
+        author.name = @site.config['author']
+        author.email = @site.config['email'] if @site.config['email']
+      end
+
+      # Insert post entires
+      @posts.each do |post|
+        entry = feed.entries.new
+        entry.id = post.id
+        entry.title = post.data['title']
+        entry.updated = post.date
+	entry.summary = Nokogiri::HTML(post.content).text[0..300]
+
+        link_alt = entry.links.new
+        link_alt.href = @site.config['url'] + URI.escape(post.url)
+
+        post.categories.each do |c|
+          category = entry.categories.new
+          category.term = c
+        end
+
+        post.transform
+        entry.content = post.content
+        entry.content.type = 'html'
+      end
+
+      feed
+    end
+  end
+
+  class FeedGenerator < Generator
+    safe true
+    priority :lowest
+
+    def generate(site)
+      feed_dir = site.config['feed_dir'] || 'feed'
+
+      # Generate our feed for the whole site.
+      site.static_files << FeedFile.new(
+          site,
+          site.dest,
+          feed_dir,
+          'atom.xml',
+          site.site_payload['site']['posts'])
+
+      # Generate a feed for each category.
+      site.site_payload['site']['categories'].each do |category, pages|
+        site.static_files << FeedFile.new(
+            site, site.dest,
+            File.join(feed_dir, category),
+            'atom.xml',
+            pages,
+            category)
+      end
+    end
+  end
+
+  # Liquid Tag
+  class PageFeedUrl < Liquid::Tag
+    def render(context)
+      site = context.registers[:site]
+      page_url = context.environments.first["page"]["url"]
+      feed_dir = site.config['feed_dir'] || 'feed'
+
+      # Search for the page's category within the url.
+      category = nil
+      page_url.split('/').reverse_each do | path_part |
+        if site.site_payload['site']['categories'].has_key? path_part
+          category = path_part
+          break
+        end
+      end
+
+      if category
+        feed_url = URI.escape("/#{feed_dir}/#{category}/atom.xml")
+      else
+        feed_url = URI.escape("/#{feed_dir}/atom.xml")
+      end
+
+      feed_url
+    end
+  end
+
+  Liquid::Template.register_tag('page_feed_url', Jekyll::PageFeedUrl)
+end
diff --git a/_plugins/ext.rb b/_plugins/ext.rb
new file mode 100644
index 0000000..ceea957
--- /dev/null
+++ b/_plugins/ext.rb
@@ -0,0 +1 @@
+require 'jekyll/tagging'