--- wordpress/wp-includes/query.php	2007-03-06 17:45:40.000000000 +0000
+++ wp-includes/query.php	2007-04-27 04:13:54.000000000 +0000
@@ -592,8 +592,13 @@
 		if ( !isset($q['post_type']) )
 			$q['post_type'] = 'post';
 		$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_archive || $this->is_search || $this->is_category) {
+				$q['posts_per_page'] = get_option('posts_per_archive_page');
+			} 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'];
--- wordpress/wp-admin/options.php	2006-12-21 10:10:04.000000000 +0000
+++ wp-admin/options.php	2007-04-27 04:22:33.000000000 +0000
@@ -27,6 +27,7 @@
 
 		case 'posts_per_page':
 		case 'posts_per_rss':
+		case 'posts_per_archive_page':
 			$value = stripslashes($value);
 			$value = (int) $value;
 			if ( empty($value) ) $value = 1;
--- wordpress/wp-admin/options-reading.php	2007-01-29 16:44:47.000000000 +0000
+++ wp-admin/options-reading.php	2007-04-27 04:23:13.000000000 +0000
@@ -55,6 +55,12 @@
 <input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" /> <?php _e('posts') ?>
 </td> 
 </tr> 
+<tr valign="top">
+<th width="33%" scope="row"><?php _e('Show on archives:') ?></th>
+<td>
+<input name="posts_per_archive_page" type="text" id="posts_per_archive_page" value="<?php form_option('posts_per_archive_page'); ?>" size="3" /> <?php _e('posts'); ?>
+</td>
+</tr>
 </table> 
 </fieldset> 
 
@@ -88,9 +94,9 @@
 </p>
 <p class="submit">
 <input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="posts_per_page,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts" /> 
+<input type="hidden" name="page_options" value="posts_per_page,posts_per_archive_page,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts" /> 
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> 
 </p> 
 </form> 
 </div> 
-<?php include('./admin-footer.php'); ?>
\ No newline at end of file
+<?php include('./admin-footer.php'); ?>