diff --git a/Rakefile b/Rakefile
index a462c35..720ab68 100644
--- a/Rakefile
+++ b/Rakefile
@@ -63,7 +63,8 @@ namespace :build do
     FileUtils.mkdir_p(TAGS_DIR)
     tags = @blog.categories
     tags.each do |tag, posts|
-      File.open(File.join(TAGS_DIR, tag + ".html"), "w") do |file|
+      FileUtils.mkdir_p(File.join(TAGS_DIR, tag))
+      File.open(File.join(TAGS_DIR, tag, "index.html"), "w") do |file|
         generate_index posts, file, "title" => "#{tag}"
       end
     end
diff --git a/source/blog/_includes/post-div.html b/source/blog/_includes/post-div.html
index 656fff2..ccd5e88 100644
--- a/source/blog/_includes/post-div.html
+++ b/source/blog/_includes/post-div.html
@@ -7,7 +7,7 @@
 		<a href="/blog{{ page.url }}">{{ page.title }}</a>
 		<div class="post-title-sub">
 			by Jim Myhrberg – tags:
-			{% for tag in page.categories %} <a href="/blog/tag/{{tag}}" rel="tag"><i class="hash">#</i>{{tag}}</a>{% if forloop.last != true %},{% endif %}{% endfor %}
+			{% for tag in page.categories %} <a href="/blog/tag/{{tag}}/" rel="tag"><i class="hash">#</i>{{tag}}</a>{% if forloop.last != true %},{% endif %}{% endfor %}
 		</div>
 	</h1>
 
diff --git a/source/blog/_layouts/post.html b/source/blog/_layouts/post.html
index 1ed506b..6af7689 100644
--- a/source/blog/_layouts/post.html
+++ b/source/blog/_layouts/post.html
@@ -23,7 +23,7 @@
 				{{ page.title }}
 				<div class="post-title-sub">
 					by Jim Myhrberg – tags:
-					{% for tag in page.categories %} <a href="/blog/tag/{{tag}}" rel="tag"><i class="hash">#</i>{{tag}}</a>{% if forloop.last != true %},{% endif %}{% endfor %}
+					{% for tag in page.categories %} <a href="/blog/tag/{{tag}}/" rel="tag"><i class="hash">#</i>{{tag}}</a>{% if forloop.last != true %},{% endif %}{% endfor %}
 				</div>
 			</h1>
 
@@ -39,10 +39,7 @@
 	
 	{% include sidebar.html %}
 	
-	<div class="post-paginator">
-		<a href="/blog/archive/">archive</a><br />
-		<a href="http://feeds.feedburner.com/jimeh">rss</a>
-	</div>
+	{% include paginator-empty.html %}
 	
 </div>