diff --git a/bin/controller.rc b/bin/controller.rc
index 0c15c3f..6adb71f 100755
--- a/bin/controller.rc
+++ b/bin/controller.rc
@@ -216,6 +216,16 @@ fn select_handler {
     if not if (~ $body *.html && test -f $body)
         set_handler html_handler $body
 
+    # Rss feeds. TODO: we should check that the request is for a real blog dir
+    if not if (~ $REQUEST_URI */index.rss) {
+        uri = `{echo $uri | sed 's/index.rss$//'}
+        if (~ $blogDirs 0)
+            blogDirs = $sitedir^$uri
+        uri=$baseuri$"uri
+        master_template=feeds/rss20.tpl
+        response_format=raw
+    }
+
     # Blog handler
     if not if (~ $body */[bB]log/index */[bB]log//index || ! ~ $#blogDirs 0) {
         if (~ $#blogDirs 0)
@@ -230,16 +240,6 @@ fn select_handler {
         set_handler blog_dir_handler $blogDirs
     }
 
-    # Rss feeds. TODO: we should check that the request is for a real blog dir
-    if not if (~ $REQUEST_URI */index.rss) {
-        uri = `{echo $uri | sed 's/index.rss$//'}
-        if (~ $blogDirs 0)
-            blogDirs = $sitedir^$uri
-        uri=$baseuri$"uri
-        master_template=feeds/rss20.tpl
-        response_format=raw
-    }
-
     # Global tpl (eg sitemap.tpl)
     if not if (test -f lib/^$uri^.tpl)
         set_handler tpl_handler lib/^$uri^.tpl
diff --git a/lib/feeds/rss20.tpl b/lib/feeds/rss20.tpl
index bbb50c4..7b0ea74 100644
--- a/lib/feeds/rss20.tpl
+++ b/lib/feeds/rss20.tpl
@@ -1,5 +1,7 @@
 Content-Type: text/xml; charset=utf-8
 
+<?xml version="1.0" encoding="UTF-8"?>
+
 %{
 fn statpost {
 	f = $1
@@ -25,7 +27,6 @@ fn statpost {
 
 %}
 
-<?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 	<channel>
 		<atom:link href="%('http://'$site^$REQUEST_URI%)" rel="self" type="application/rss+xml" />