Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php	(revision 4144)
+++ wp-includes/link-template.php	(working copy)
@@ -357,9 +357,9 @@
 
 	$qstr = wp_specialchars($_SERVER['REQUEST_URI']);
 
-	$page_querystring = "paged"; 
-	$page_modstring = "page/";
-	$page_modregex = "page/?";
+	$page_querystring = 'paged'; 
+	$page_modstring = $wp_rewrite->page_number_base . '/';
+	$page_modregex = $wp_rewrite->pace_number_base . '/?';
 	$permalink = 0;
 
 	$home_root = parse_url(get_option('home'));
Index: wp-includes/rewrite.php
===================================================================
--- wp-includes/rewrite.php	(revision 4144)
+++ wp-includes/rewrite.php	(working copy)
@@ -150,14 +150,14 @@
 	var $permalink_structure;
 	var $category_base;
 	var $category_structure;
-	var $author_base = 'author';
+	var $author_base;
 	var $author_structure;
 	var $date_structure;
 	var $page_structure;
-	var $search_base = 'search';
+	var $search_base;
 	var $search_structure;
-	var $comments_base = 'comments';
-	var $feed_base = 'feed';
+	var $comments_base;
+	var $feed_base;
 	var $comments_feed_structure;
 	var $feed_structure;
 	var $front;
@@ -218,6 +218,7 @@
 					);
 
 	var $feeds = array ( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
+	var $page_number_base;
 	
 	function using_permalinks() {
 		if (empty($this->permalink_structure))
@@ -232,7 +233,7 @@
 		}
 
 		// If the index is not in the permalink, we're using mod_rewrite.
-		if (preg_match('#^/*' . $this->index . '#', $this->permalink_structure)) {
+		if (preg_match('#^/*' . $this->index . '#', $this->permalink_structure)) { /* */
 			return true;
 		}
     
@@ -480,7 +481,7 @@
 
 		//build a regex to match the trackback and page/xx parts of URLs
 		$trackbackregex = 'trackback/?$';
-		$pageregex = 'page/?([0-9]{1,})/?$';
+		$pageregex = $this->page_number_base . '/?([0-9]{1,})/?$';
 		
 		//build up an array of endpoint regexes to append => queries to append
 		if ($endpoints) {
@@ -860,6 +861,12 @@
 			$this->root = $this->index . '/';
 		}
 		$this->category_base = get_option('category_base');
+		$this->author_base = trim(__('/author/'), '/');
+		$this->search_base = trim(__('/search/'), '/');
+		$this->comments_base = trim(__('/comments/'), '/');
+		$this->feed_base = trim(__('/feed/'), '/');
+		$this->page_number_base = trim(__('/page/'), '/');
+
 		unset($this->category_structure);
 		unset($this->author_structure);
 		unset($this->date_structure);
@@ -888,4 +895,4 @@
 	}
 }
 
-?>
\ No newline at end of file
+?>