diff --git a/wp-blog-header.php b/wp-blog-header.php
index 840c6cfb1..8216bef28 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -255,6 +255,11 @@ if ($pagenow == 'index.php') {
 			$wp_did_template_redirect = true;
 			include("$wp_template_dir/search.php");
 			exit;
+		} else if (is_paged() &&
+							 file_exists("$wp_template_dir/paged.php")) {
+			$wp_did_template_redirect = true;
+			include("$wp_template_dir/paged.php");
+			exit;
 		} else if (file_exists("$wp_template_dir/index.php"))
 			{
 				$wp_did_template_redirect = true;
diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 610bff4f0..cf1a73bfc 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -176,7 +176,7 @@ class WP_Query {
 			$this->is_paged = true;
 		}
 
-		if ( ($this->is_date || $this->is_author || $this->is_category || $this->is_paged)
+		if ( ($this->is_date || $this->is_author || $this->is_category)
 				 && (! ($this->is_single || $this->is_page)) ) {
 			$this->is_archive = true;
 		}