diff --git a/actions/tagrss.php b/actions/tagrss.php
new file mode 100644
index 0000000000..9187bdc873
--- /dev/null
+++ b/actions/tagrss.php
@@ -0,0 +1,65 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/lib/rssaction.php');
+
+// Formatting of RSS handled by Rss10Action
+
+class TagrssAction extends Rss10Action {
+
+	function init() {
+		$tag = $this->trimmed('tag');
+		$this->tag = Notice_tag::staticGet('tag', $tag);
+
+		if (!$this->tag) {
+			common_user_error(_('No such tag.'));
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	function get_notices($limit=0) {
+		$tag = $this->tag;
+
+		if (is_null($tag)) {
+			return NULL;
+		}
+
+		$notice = Notice_tag::getStream($tag->tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
+
+		while ($notice->fetch()) {
+			$notices[] = clone($notice);
+		}
+
+		return $notices;
+	}
+
+	function get_channel() {
+		$tag = $this->tag->tag;
+
+		$c = array('url' => common_local_url('tagrss', array('tag' => $tagname)),
+			   'title' => $tagname,
+			   'link' => common_local_url('tagrss', array('tag' => $tagname)),
+			   'description' => sprintf(_('Microblog tagged with %s'), $tagname));
+		return $c;
+	}
+}
diff --git a/htaccess.sample b/htaccess.sample
index 034b2c641e..daa4cafd64 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -63,6 +63,7 @@ RewriteRule ^message/(\d+)$ index.php?action=showmessage&message=$1 [L,QSA]
 RewriteRule ^user/(\d+)$ index.php?action=userbyid&id=$1 [L,QSA]
 
 RewriteRule ^tags/?$ index.php?action=tag [L,QSA]
+RewriteRule ^tag(/(.*))?/rss$ index.php?action=tagrss&tag=$2 [L,QSA]
 RewriteRule ^tag(/(.*))?$ index.php?action=tag&tag=$2 [L,QSA]
 
 RewriteRule ^(\w+)/subscriptions$ index.php?action=subscriptions&nickname=$1 [L,QSA]