diff --git a/Gemfile b/Gemfile
index a072e37..abadbd0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,13 +7,14 @@ gem 'kramdown'
 
 gem 'pygments.rb'
 
+gem 'builder'
+
 gem 'sass'
 gem 'compass'
 
 gem 'typogruby'
 gem 'nanoc-cachebuster'
 gem 'nanoc-javascript-concatenator'
-gem 'nanoc-code-classifier'
 
 gem 'uglifier'
 gem 'multi_json', '~> 1.3' # needed by uglifier
diff --git a/Gemfile.lock b/Gemfile.lock
index ec47f4d..886c1a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,6 +3,7 @@ GEM
   specs:
     adsf (1.1.1)
       rack (>= 1.0.0)
+    builder (3.2.0)
     chunky_png (1.2.7)
     colored (1.2)
     compass (0.12.2)
@@ -25,9 +26,6 @@ GEM
       cri (~> 2.3)
     nanoc-cachebuster (0.3.1)
       nanoc (>= 3.3.0)
-    nanoc-code-classifier (0.1.0)
-      nanoc (~> 3.0)
-      nokogiri (~> 1.0)
     nanoc-javascript-concatenator (0.0.2)
       nanoc (>= 3.3.0)
     nokogiri (1.5.9)
@@ -56,6 +54,7 @@ PLATFORMS
 
 DEPENDENCIES
   adsf
+  builder
   compass
   haml
   i18n
@@ -64,7 +63,6 @@ DEPENDENCIES
   multi_json (~> 1.3)
   nanoc
   nanoc-cachebuster
-  nanoc-code-classifier
   nanoc-javascript-concatenator
   nokogiri
   pygments.rb
diff --git a/Rules b/Rules
index 31acced..2e37ed4 100644
--- a/Rules
+++ b/Rules
@@ -22,6 +22,10 @@ compile '/js/*/' do
   filter :uglify_js
 end
 
+compile '/rss/' do
+  filter :erb
+end
+
 compile '/posts/*' do
   filter :kramdown
   filter :pygmentizer
@@ -71,6 +75,10 @@ route '/js/*/' do
   item.identifier.chop + fp + '.js'
 end
 
+route '/rss/' do
+  '/rss.xml'
+end
+
 route '/posts/*' do
   y, m, d, slug = /([0-9]+)\-([0-9]+)\-([0-9]+)\-([^\/]+)/.match(item.identifier).captures
   "/#{y}/#{m}/#{d}/#{slug}/index.html"
diff --git a/content/rss.erb b/content/rss.erb
new file mode 100644
index 0000000..80e44f0
--- /dev/null
+++ b/content/rss.erb
@@ -0,0 +1 @@
+<%= atom_feed title: 'ariejan.net', author_name: 'Ariejan de Vroom', author_uri: 'http://ariejan.net', limit: 10 %>
\ No newline at end of file
diff --git a/layouts/default.haml b/layouts/default.haml
index 77f461b..f2768ff 100644
--- a/layouts/default.haml
+++ b/layouts/default.haml
@@ -6,13 +6,18 @@
 %html{:dir => "ltr", :lang => "en-US"}
   / <![endif]
   %head
+    %meta{:charset => 'utf-8'}
     %meta{:content => "text/html;charset=utf-8", "http-equiv" => "content-type"}
-    %meta{:content => "cmsmasters responsive html5 website template", :name => "description"}
-    %meta{:content => "html5, css3, template, responsive, adaptive", :name => "keywords"}
+    %meta{:content => "a blog by ariejan de vroom about software engineering and craftsmanship.", :name => "description"}
+    %meta{:content => "software engineering, programming, craftsmanship, devops, ruby, rubyonrails, rails, git, svn, postgres, postgresql, mysql, mac, ios, apple, web2.0, go, golang", :name => "keywords"}
     %meta{:content => "width=device-width, initial-scale=1, maximum-scale=1", :name => "viewport"}
+    %meta{:content => "3bgidck6YUMyx-kvL_a8E4ry0DJOAIOYaZkZxQ0kZw4", :name => "google-site-verification"}
+
+    %link(href='http://www.myopenid.com/server' rel='openid.server')
+    %link(href='http://ariejan.myopenid.com/' rel='openid.delegate')
 
     %link{:href => "/images/favicon.ico", :rel => "shortcut icon", :type => "image/x-icon"}
-
+    %link{:rel => "alternate", :type => "application/rss+xml", :title => "RSS", :href => "http://ariejan.net/rss.xml"}
     %link{:href => "/css/style.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}
 
     %link{:href => "http://fonts.googleapis.com/css?family=Open+Sans:400,600,800,400italic", :rel => "stylesheet", :type => "text/css"}
diff --git a/layouts/social_list.haml b/layouts/social_list.haml
index fb0876a..5975192 100644
--- a/layouts/social_list.haml
+++ b/layouts/social_list.haml
@@ -9,7 +9,7 @@
     %a{:href => "https://twitter.com/ariejan", :title => "Twitter"}
       %img{:alt => "Twitter", :src => "/images/socicons/twitter.png"}/
   %li
-    %a{:href => "http://feeds.feedburner.com/Ariejan", :title => "RSS Feed"}
+    %a{:href => "http://ariejan.net/rss.xml", :title => "RSS Feed"}
       %img{:alt => "RSS Feed", :src => "/images/socicons/rss.png"}/
   %li
     %a{:href => "mailto:ariejan@ariejan.net", :title => "E-mail"}