diff --git a/contrib/rss_images/main.php b/contrib/rss_images/main.php
index 7f68ff4c..04b891d1 100644
--- a/contrib/rss_images/main.php
+++ b/contrib/rss_images/main.php
@@ -17,30 +17,41 @@ class RSS_Images implements Extension {
 			if(count($event->search_terms) > 0) {
 				$search = implode(' ', $event->search_terms);
 				$page->add_header("<link rel=\"alternate\" type=\"application/rss+xml\" ".
-					"title=\"$title - Images with tags: $search\" href=\"".make_link("rss/images/$search")."\" />");
+					"title=\"$title - Images with tags: $search\" href=\"".make_link("rss/images/$search/1")."\" />");
 			}
 			else {
 				$page->add_header("<link rel=\"alternate\" type=\"application/rss+xml\" ".
-					"title=\"$title - Images\" href=\"".make_link("rss/images")."\" />");
+					"title=\"$title - Images\" href=\"".make_link("rss/images/1")."\" />");
 			}
 		}
 
-		if(($event instanceof PageRequestEvent) && $event->page_matches("rss")) {
-			if($event->get_arg(0) == 'images') {
-				global $config;
-				global $database;
-				if($event->count_args() >= 2) {
-					$this->do_rss(Image::find_images($config, $database, 0, 12, tag_explode($event->get_arg(1))));
-				}
-				else {
-					$this->do_rss(image::find_images($config, $database, 0, 12));
+		if(($event instanceof PageRequestEvent) && $event->page_matches("rss/images")) {
+			global $config;
+			global $database;
+
+			$page_number = 0;
+			$search_terms = array();
+
+			if($event->count_args() == 1) {
+				$page_number = int_escape($event->get_arg(0));
+				// compat hack, deprecate this later
+				if($page_number == 0) {
+					$search_terms = explode(' ', $event->get_arg(0));
+					$page_number = 1;
 				}
 			}
+			else if($event->count_args() == 2) {
+				$search_terms = explode(' ', $event->get_arg(0));
+				$page_number = int_escape($event->get_arg(1));
+			}
+
+			$images = Image::find_images($config, $database, ($page_number-1)*10, 10, $search_terms);
+			$this->do_rss($images, $search_terms, $page_number);
 		}
 	}
 // }}}
 // output {{{
-	private function do_rss($images) {
+	private function do_rss($images, $search_terms, $page_number) {
 		global $page;
 		global $config;
 		$page->set_mode("data");
@@ -74,6 +85,21 @@ class RSS_Images implements Extension {
 
 		$title = $config->get_string('title');
 		$base_href = $config->get_string('base_href');
+		$search = "";
+		if(count($search_terms) > 0) {
+			$search = html_escape(implode(" ", $search_terms)) . "/";
+		}
+
+		if($page_number > 1) {
+			$prev_url = make_link("rss/images/$search".($page_number-1));
+			$prev_link = "<atom:link rel=\"previous\" href=\"$prev_url\" />";
+		}
+		else {
+			$prev_link = "";
+		}
+		$next_url = make_link("rss/images/$search".($page_number+1));
+		$next_link = "<atom:link rel=\"next\" href=\"$next_url\" />"; // no end...
+
 		$version = VERSION;
 		$xml = "<"."?xml version=\"1.0\" encoding=\"utf-8\" ?".">
 <rss version=\"2.0\" xmlns:media=\"http://search.yahoo.com/mrss\">
@@ -83,6 +109,8 @@ class RSS_Images implements Extension {
 		<link>$base_href</link>
 		<generator>Shimmie-$version</generator>
 		<copyright>(c) 2007 Shish</copyright>
+		$prev_link
+		$next_link
 		$data
 	</channel>
 </rss>";