Index: query.php
===================================================================
--- query.php	(revision 19732)
+++ query.php	(working copy)
@@ -1984,8 +1984,14 @@
 				$q['post_type'] = '';
 		}
 		$post_type = $q['post_type'];
-		if ( !isset($q['posts_per_page']) || $q['posts_per_page'] == 0 )
-			$q['posts_per_page'] = get_option('posts_per_page');
+		if ( !isset($q['posts_per_page']) || $q['posts_per_page'] == 0 ) {
+			if ( $this->is_feed ) {
+				$q['posts_per_page'] = get_option('posts_per_rss');
+			}
+			else {
+				$q['posts_per_page'] = get_option('posts_per_page');
+			}
+		}
 		if ( isset($q['showposts']) && $q['showposts'] ) {
 			$q['showposts'] = (int) $q['showposts'];
 			$q['posts_per_page'] = $q['showposts'];
@@ -1999,10 +2005,6 @@
 				$q['nopaging'] = false;
 			}
 		}
-		if ( $this->is_feed ) {
-			$q['posts_per_page'] = get_option('posts_per_rss');
-			$q['nopaging'] = false;
-		}
 		$q['posts_per_page'] = (int) $q['posts_per_page'];
 		if ( $q['posts_per_page'] < -1 )
 			$q['posts_per_page'] = abs($q['posts_per_page']);