diff --git a/_plugins/category_feeds.rb b/_plugins/category_feeds.rb
index aed3e03..acf5d61 100644
--- a/_plugins/category_feeds.rb
+++ b/_plugins/category_feeds.rb
@@ -47,6 +47,14 @@ module Jekyll
       true
     end
 
+    def header()
+        formatted = Jekyll::Utils::slugify(@category)
+        return "---\n"\
+               "permalink: /#{@dir}/#{@formatted}/\n"\
+               "layout: null\n"\
+               "---"
+    end
+
     # Creates our feed using the Atom library.
     def createFeed
       feed = Atom::Feed.new self.url
@@ -108,7 +116,8 @@ module Jekyll
       site.static_files << FeedFile.new(
           site,
           site.dest,
-          feed_dir,
+          '',
+#           feed_dir,
           'atom.xml',
           site.site_payload['site']['posts'])
 
@@ -116,7 +125,7 @@ module Jekyll
       site.site_payload['site']['categories'].each do |category, pages|
         site.static_files << FeedFile.new(
             site, site.dest,
-            File.join(feed_dir, category),
+            File.join(feed_dir, Jekyll::Utils::slugify(category), 'rss'),
             'atom.xml',
             pages,
             category)