diff --git a/run-server b/run-server
index 534e752..3cc02c7 100755
--- a/run-server
+++ b/run-server
@@ -1 +1 @@
-/home/raoul/VirtualEnv/ScribeEngine/trunk/bin/paster serve development.ini --reload
+/home/raoul/VirtualEnv/ScribeEngine/feeds/bin/paster serve development.ini --reload
diff --git a/scribeengine/controllers/blog.py b/scribeengine/controllers/blog.py
index 3f87f02..2d43e18 100644
--- a/scribeengine/controllers/blog.py
+++ b/scribeengine/controllers/blog.py
@@ -74,7 +74,7 @@ class BlogController(BaseController):
     def tag(self, id=None):
         if not id:
             h.redirect_to('/')
-        c.tag = Session.query(Tag).filter_by(url=id).first()
+        c.tag = Session.query(Tag).filter_by(url=id).all()
         if not c.tag:
             h.redirect_to('/')
         c.page_title = u'Blog posts with tag: %s' % c.tag.name
diff --git a/scribeengine/controllers/feed.py b/scribeengine/controllers/feed.py
new file mode 100644
index 0000000..82702a0
--- /dev/null
+++ b/scribeengine/controllers/feed.py
@@ -0,0 +1,59 @@
+import logging
+import uuid
+import re
+
+from feedformatter import Feed
+import time
+
+from scribeengine.lib.base import *
+from scribeengine.model.meta import Session
+from scribeengine.model import Post, Variable
+
+log = logging.getLogger(__name__)
+
+class FeedController(BaseController):
+
+    def _generate_feed(self):
+        blog_title = Session.query(Variable).get(u'blog title').value
+        blog_slogan = Session.query(Variable).get(u'blog slogan').value
+        blog_link = str('%s://%s' % (request.environ[u'wsgi.url_scheme'], \
+                                     request.environ[u'HTTP_HOST']))
+        if blog_link.endswith(u'/'):
+            blog_link = blog_link[:-1]
+        posts = Session.query(Post)\
+            .filter_by(status=u'published')\
+            .order_by(Post.created.desc())\
+            .all()
+        # Create the feed
+        feed = Feed()
+        # Set the feed/channel level properties
+        feed.feed[u'title'] = blog_title
+        feed.feed[u'link'] = blog_link + u'/'
+        feed.feed[u'description'] = blog_slogan
+        for post in posts:
+            # Create an item
+            item = {}
+            item[u'title'] = post.title
+            item[u'link'] = blog_link + h.url_for_post(post)
+            item[u'author'] = post.user.nick
+            item[u'description'] = re.sub(r'<(.*?)>', u'', h.teaser(post.body))
+            item[u'pubDate'] = post.created.timetuple()
+            item[u'guid'] = str(uuid.uuid5(uuid.NAMESPACE_URL, blog_link + h.url_for_post(post)))
+            # Add item to feed
+            feed.items.append(item)
+        return feed
+
+    def index(self):
+        h.redirect_to(h.url_for(action=u'atom'))
+
+    def rss(self, id=u'2.0'):
+        feed = self._generate_feed()
+        if id == u'1.0':
+            return feed.format_rss1_string()
+        else:
+            return feed.format_rss2_string()
+
+    def atom(self):
+        feed = self._generate_feed()
+        return feed.format_atom_string()
+
diff --git a/scribeengine/lib/base.py b/scribeengine/lib/base.py
index d4fe506..339b356 100644
--- a/scribeengine/lib/base.py
+++ b/scribeengine/lib/base.py
@@ -49,7 +49,6 @@ log = logging.getLogger(__name__)
 class BaseController(WSGIController):
 
     def __before__(self):
-        #c.theme_name = Session.query(Configuration).get(u'theme').value
         if session.get(u'REMOTE_USER'):
             c.current_user = Session.query(User).get(session[u'REMOTE_USER'])
         c.blog_title = Session.query(Variable).get(u'blog title').value
diff --git a/scribeengine/lib/helpers.py b/scribeengine/lib/helpers.py
index ca64222..d020ee9 100644
--- a/scribeengine/lib/helpers.py
+++ b/scribeengine/lib/helpers.py
@@ -61,7 +61,7 @@ class Flash(object):
         return message_type
 
 
-def teaser(text, url):
+def teaser(text):
     position = text.find(u'</p>')
     if position > 0:
         return text[:position + 4]
diff --git a/scribeengine/templates/base.mako b/scribeengine/templates/base.mako
index f6f63f8..ed63f0a 100644
--- a/scribeengine/templates/base.mako
+++ b/scribeengine/templates/base.mako
@@ -6,6 +6,8 @@
     <title>${c.page_title}</title>
     <meta name="keywords" content="" />
     <meta name="description" content="" />
+    <link href="${h.url_for(controller=u'feed', action=u'atom')}" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed" />
+    <link href="${h.url_for(controller=u'feed', action=u'rss')}" type="application/rss+xml" rel="alternate" title="Sitewide RSS Feed" />
     <link href="${h.url_for('/styles/style.css')}" rel="stylesheet" type="text/css" media="screen" />
 % for script in c.scripts:
     <script src="/scripts/${script}" type="text/javascript"></script>
diff --git a/scribeengine/templates/blog/index.mako b/scribeengine/templates/blog/index.mako
index cb560ae..011f27a 100644
--- a/scribeengine/templates/blog/index.mako
+++ b/scribeengine/templates/blog/index.mako
@@ -4,7 +4,7 @@
         <div class="post">
             <h2 class="title"><a href="${h.url_for_post(post)}">${post.title}</a></h2>
             <div class="entry">
-                ${h.literal(h.teaser(post.body, h.url_for_post(post)))}
+                ${h.literal(h.teaser(post.body))}
             </div>
             <p class="meta">
               <span class="byline">Posted by ${post.user.nick} on ${post.created.strftime('%B %d, %Y')}</span>
diff --git a/scribeengine/templates/blog/tag.mako b/scribeengine/templates/blog/tag.mako
index 6fd917a..2d566d7 100644
--- a/scribeengine/templates/blog/tag.mako
+++ b/scribeengine/templates/blog/tag.mako
@@ -5,7 +5,7 @@
         <div class="post">
             <h3 class="title"><a href="${h.url_for_post(post)}">${post.title}</a></h3>
             <div class="entry">
-                ${h.literal(h.teaser(post.body, h.url_for_post(post)))}
+                ${h.literal(h.teaser(post.body))}
             </div>
             <p class="meta">
               <span class="byline">Posted by ${post.user.nick} on ${post.created.strftime('%B %d, %Y')}</span>
diff --git a/scribeengine/tests/functional/test_feed.py b/scribeengine/tests/functional/test_feed.py
new file mode 100644
index 0000000..b9702ee
--- /dev/null
+++ b/scribeengine/tests/functional/test_feed.py
@@ -0,0 +1,7 @@
+from scribeengine.tests import *
+
+class TestFeedController(TestController):
+
+    def test_index(self):
+        response = self.app.get(url(controller='feed', action='index'))
+        # Test response...