diff --git a/app/controllers/feeds.rb b/app/controllers/feeds.rb
new file mode 100644
index 0000000..94eb908
--- /dev/null
+++ b/app/controllers/feeds.rb
@@ -0,0 +1,13 @@
+class Feeds < Application
+  only_provides :xml
+  def rss
+    @items = []
+    [ Page, Comment ].each do |kls|
+      @items.concat kls.find(:all, :limit => 25, :order => 'created_at DESC')
+    end
+    @items.sort! do |a, b|
+      b.created_at <=> a.created_at
+    end
+    render :format => :xml
+  end
+end
diff --git a/app/helpers/feeds_helper.rb b/app/helpers/feeds_helper.rb
new file mode 100644
index 0000000..5a25ad6
--- /dev/null
+++ b/app/helpers/feeds_helper.rb
@@ -0,0 +1,5 @@
+module Merb
+  module FeedsHelper
+
+  end
+end # Merb
\ No newline at end of file
diff --git a/app/views/feeds/rss.xml.erb b/app/views/feeds/rss.xml.erb
new file mode 100644
index 0000000..34b5689
--- /dev/null
+++ b/app/views/feeds/rss.xml.erb
@@ -0,0 +1,26 @@
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <channel>
+    <title><%= tuxconfig[:site_name] -%></title>
+    <link><%= absolute_url(:controller => :news, :action => :index) -%></link>
+    <description><%= tuxconfig[:news_heading] -%></description>
+    <language>en-us</language>
+<% @items.each_with_index do |item, index| -%>
+<% break if index >= 25 -%>
+    <item>
+<% if item.is_a? Page -%>
+      <title><%= item.name -%></title>
+      <link><%= absolute_url(:page, item.name.gsub(/ /, '_')) -%></link>
+      <description><%= item.published? ? 'New blog post' : 'New wiki page' -%></description>
+      <dc:creator><%= item.author.name -%></dc:creator>
+      <dc:date><%= item.created_at -%></dc:date>
+<% elsif item.is_a? Comment -%>
+      <title>Comment on <%= item.page.name -%></title>
+      <link><%= absolute_url(:page, item.page.name.gsub(/ /, '_')) -%></link>
+      <description>new comment by <%= item.name -%>!</description>
+      <dc:creator><%= item.name -%></dc:creator>
+      <dc:date><%= item.created_at.to_date -%></dc:date> 
+<% end -%>
+    </item>
+<% end -%>
+  </channel>
+</rss>
diff --git a/app/views/layout/application.html.erb b/app/views/layout/application.html.erb
index 41212b3..7835ee0 100644
--- a/app/views/layout/application.html.erb
+++ b/app/views/layout/application.html.erb
@@ -8,6 +8,8 @@
 <link rel="stylesheet" href="/stylesheets/application.css" type="text/css" media="screen" charset="utf-8" />
 <link rel="stylesheet" href="/stylesheets/tuxbliki.css" type="text/css" media="all" charset="utf-8" />
 
+<link rel="alternate" type="application/rss+xml" title="RSS2.0" href="/feeds/rss.xml" />
+
 <script src="/javascripts/prototype.js" type="text/javascript"></script>
 <script src="/javascripts/scriptaculous.js" type="text/javascript"></script>
 <script src="/javascripts/curvycorners.js" type="text/javascript"></script>
diff --git a/config/router.rb b/config/router.rb
index 3ccd353..f1a63e1 100644
--- a/config/router.rb
+++ b/config/router.rb
@@ -43,4 +43,8 @@ Merb::Router.prepare do |r|
     :controller => 'news',
     :action => 'index'
   )
+  r.match('/feeds/:action.xml').to(
+    :controller => 'feeds',
+    :format => 'xml'
+  )
 end
diff --git a/spec/controllers/feeds_spec.rb b/spec/controllers/feeds_spec.rb
new file mode 100644
index 0000000..fceb9a2
--- /dev/null
+++ b/spec/controllers/feeds_spec.rb
@@ -0,0 +1,7 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe Feeds, "index action" do
+  before(:each) do
+    dispatch_to(Feeds, :index)
+  end
+end
\ No newline at end of file
diff --git a/spec/helpers/feeds_helper_spec.rb b/spec/helpers/feeds_helper_spec.rb
new file mode 100644
index 0000000..364f07b
--- /dev/null
+++ b/spec/helpers/feeds_helper_spec.rb
@@ -0,0 +1,5 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe Merb::FeedsHelper do
+
+end
\ No newline at end of file