diff --git a/nyaa/routes.py b/nyaa/routes.py
index b92c070..d4ea7a3 100644
--- a/nyaa/routes.py
+++ b/nyaa/routes.py
@@ -121,7 +121,6 @@ def search(term='', user=None, sort='id', order='desc', category='0_0', quality_
     if rss:
         sort = sort_keys['id']
         order = 'desc'
-        page = 1
 
     same_user = False
     if flask.g.user:
diff --git a/nyaa/templates/layout.html b/nyaa/templates/layout.html
index 1b4eb87..3491297 100644
--- a/nyaa/templates/layout.html
+++ b/nyaa/templates/layout.html
@@ -8,6 +8,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<link rel="shortcut icon" type="image/png" href="/static/favicon.png">
 		<link rel="icon" type="image/png" href="/static/favicon.png">
+		<link rel="alternate" type="application/rss+xml" href="{% if rss_filter %}{{ url_for('home', page='rss', _external=True, **rss_filter) }}{% else %}{{ url_for('home', page='rss', _external=True) }}{% endif %}" />
 
 		<!-- Bootstrap core CSS -->
 		<!--
diff --git a/nyaa/templates/rss.xml b/nyaa/templates/rss.xml
index abe6f06..266e524 100644
--- a/nyaa/templates/rss.xml
+++ b/nyaa/templates/rss.xml
@@ -12,6 +12,13 @@
 			<guid isPermaLink="true">{{ url_for('view_torrent', torrent_id=torrent.id, _external=True) }}</guid>
 			<pubDate>{{ torrent.created_time|rfc822 }}</pubDate>
 		</item>
+		{% else %}
+		<item>
+			<title>{{ torrent.display_name }}</title>
+			<link>{{ torrent.magnet_uri }}</link>
+			<guid isPermaLink="true">{{ url_for('view_torrent', torrent_id=torrent.id, _external=True) }}</guid>
+			<pubDate>{{ torrent.created_time|rfc822 }}</pubDate>
+		</item>
 		{% endif %}
 		{% endfor %}
 	</channel>