diff --git a/templates/themes/rss/info.php b/templates/themes/rss/info.php
new file mode 100755
index 00000000..14b39eb9
--- /dev/null
+++ b/templates/themes/rss/info.php
@@ -0,0 +1,61 @@
+<?php
+	$theme = Array();
+	
+	// Theme name
+	$theme['name'] = 'RSS';
+	// Description (you can use Tinyboard markup here)
+	$theme['description'] = 'Show recent posts and images as a RSS';
+	$theme['version'] = 'v0.1';
+	
+	// Theme configuration	
+	$theme['config'] = Array();
+	
+	$theme['config'][] = Array(
+		'title' => 'Title',
+		'name' => 'title',
+		'type' => 'text',
+		'default' => 'Recent Posts RSS'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'Excluded boards',
+		'name' => 'exclude',
+		'type' => 'text',
+		'comment' => '(space seperated)'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => '# of recent posts',
+		'name' => 'limit_posts',
+		'type' => 'text',
+		'default' => '30',
+		'comment' => '(maximum posts to display)'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'XML file',
+		'name' => 'xml',
+		'type' => 'text',
+		'default' => 'recent.xml',
+		'comment' => '(eg. "recent.xml")'
+	);
+	
+	$theme['config'][] = Array(
+		'title' => 'Base URL',
+		'name' => 'base_url',
+		'type' => 'text',
+		'default' => 'http://test.com',
+		'comment' => '(eg. "http://test.com")'
+	);
+	
+	// Unique function name for building everything
+	$theme['build_function'] = 'rss_recentposts_build';
+	$theme['install_callback'] = 'rss_recentposts_install';
+
+	if (!function_exists('rss_recentposts_install')) {
+		function rss_recentposts_install($settings) {
+			if (!is_numeric($settings['limit_posts']) || $settings['limit_posts'] < 0)
+				return Array(false, '<strong>' . utf8tohtml($settings['limit_posts']) . '</strong> is not a non-negative integer.');
+		}
+	}
+	
diff --git a/templates/themes/rss/rss.xml b/templates/themes/rss/rss.xml
new file mode 100644
index 00000000..30fdb473
--- /dev/null
+++ b/templates/themes/rss/rss.xml
@@ -0,0 +1,28 @@
+{% filter remove_whitespace %}
+<?xml version="1.0" encoding="utf-8"?>
+<rss xmlns:dc="http://purl.org/dc/elements/1.1/"
+     version="2.0">
+  <channel>
+    <description>
+      <![CDATA[{{ settings.subtitle }}]]>
+    </description>
+    <title>{{ settings.title }}</title>
+    <generator>Tinyboard {{ config.version }}</generator>
+    <link>{{ settings.base_url }}{{ config.root }}{{ settings.html }}</link>
+    {% for post in recent_posts %}
+    <item>
+      <title>{{ post.board_name }}</title>
+      <description>
+	<![CDATA[
+		 <a href="{{ settings.base_url }}{{ post.link }}">
+		 {{ post.snippet }}
+		 </a>
+	]]>
+      </description>
+      <link>{{ settings.base_url }}{{ post.link }}</link>
+      <guid>{{ settings.base_url }}{{ post.link }}</guid>
+    </item>
+    {% endfor %}
+  </channel>
+</rss>
+{% endfilter %}
diff --git a/templates/themes/rss/theme.php b/templates/themes/rss/theme.php
new file mode 100755
index 00000000..33c1b210
--- /dev/null
+++ b/templates/themes/rss/theme.php
@@ -0,0 +1,124 @@
+<?php
+	require 'info.php';
+	
+	function rss_recentposts_build($action, $settings, $board) {
+		// Possible values for $action:
+		//	- all (rebuild everything, initialization)
+		//	- news (news has been updated)
+		//	- boards (board list changed)
+		//	- post (a post has been made)
+		//	- post-thread (a thread has been made)
+		
+		$b = new RSSRecentPosts();
+		$b->build($action, $settings);
+	}
+	
+	// Wrap functions in a class so they don't interfere with normal Tinyboard operations
+	class RSSRecentPosts {
+		public function build($action, $settings) {
+			global $config, $_theme;
+			
+			/*if ($action == 'all') {
+				copy('templates/themes/recent/' . $settings['basecss'], $config['dir']['home'] . $settings['css']);
+			}*/
+			
+			$this->excluded = explode(' ', $settings['exclude']);
+			
+			if ($action == 'all' || $action == 'post' || $action == 'post-thread' || $action == 'post-delete')
+				file_write($config['dir']['home'] . $settings['xml'], $this->homepage($settings));
+		}
+		
+		// Build news page
+		public function homepage($settings) {
+			global $config, $board;
+			
+			//$recent_images = Array();
+			$recent_posts = Array();
+			//$stats = Array();
+			
+			$boards = listBoards();
+			
+			/*$query = '';
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
+					continue;
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `file` IS NOT NULL AND `file` != 'deleted' AND `thumb` != 'spoiler' UNION ALL ", $_board['uri'], $_board['uri']);
+			}
+			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_images'], $query);
+			$query = query($query) or error(db_error());
+			
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+				openBoard($post['board']);
+				
+				// board settings won't be available in the template file, so generate links now
+				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
+				$post['src'] = $config['uri_thumb'] . $post['thumb'];
+				
+				//$recent_images[] = $post;
+			}*/
+			
+			
+			$query = '';
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
+					continue;
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` UNION ALL ", $_board['uri'], $_board['uri']);
+			}
+			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query);
+			$query = query($query) or error(db_error());
+			
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+				openBoard($post['board']);
+				
+				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
+				$post['snippet'] = pm_snippet($post['body'], 30);
+				$post['board_name'] = $board['name'];
+				
+				$recent_posts[] = $post;
+			}
+			
+			// Total posts
+			/*$query = 'SELECT SUM(`top`) FROM (';
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
+					continue;
+				$query .= sprintf("SELECT MAX(`id`) AS `top` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
+			}
+			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
+			$query = query($query) or error(db_error());*/
+			//$stats['total_posts'] = number_format($query->fetchColumn());
+			
+			// Unique IPs
+			/*$query = 'SELECT COUNT(DISTINCT(`ip`)) FROM (';
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
+					continue;
+				$query .= sprintf("SELECT `ip` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
+			}
+			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
+			$query = query($query) or error(db_error());
+			//$stats['unique_posters'] = number_format($query->fetchColumn());*/
+			
+			// Active content
+			/*$query = 'SELECT SUM(`filesize`) FROM (';
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
+					continue;
+				$query .= sprintf("SELECT `filesize` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
+			}
+			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
+			$query = query($query) or error(db_error());
+			//$stats['active_content'] = $query->fetchColumn();*/
+			
+			return Element('themes/rss/rss.xml', Array(
+				'settings' => $settings,
+				'config' => $config,
+				//'boardlist' => createBoardlist(),
+				//'recent_images' => $recent_images,
+				'recent_posts' => $recent_posts,
+				//'stats' => $stats
+			));
+		}
+	};
+	
+?>