Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php	(revision 13577)
+++ wp-includes/link-template.php	(working copy)
@@ -1382,7 +1382,7 @@
 			$query_string = '';
 		}
 
-		$request = preg_replace( '|page/\d+/?$|', '', $request);
+		$request = preg_replace( "|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
 		$request = preg_replace( '|^index\.php|', '', $request);
 		$request = ltrim($request, '/');
 
@@ -1392,7 +1392,7 @@
 			$base .= 'index.php/';
 
 		if ( $pagenum > 1 ) {
-			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( 'page/' . $pagenum, 'paged' );
+			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
 		}
 
 		$result = $base . $request . $query_string;
Index: wp-includes/rewrite.php
===================================================================
--- wp-includes/rewrite.php	(revision 13577)
+++ wp-includes/rewrite.php	(working copy)
@@ -481,6 +481,15 @@
 	var $comments_base = 'comments';
 
 	/**
+	 * Pagination permalink base.
+	 *
+	 * @since 3.1.0
+	 * @access private
+	 * @var string
+	 */
+	var $pagination_base = 'page';
+
+	/**
 	 * Feed permalink base.
 	 *
 	 * @since 1.5.0
@@ -1293,7 +1302,7 @@
 
 		//build a regex to match the trackback and page/xx parts of URLs
 		$trackbackregex = 'trackback/?$';
-		$pageregex = 'page/?([0-9]{1,})/?$';
+		$pageregex = $this->pagination_base . '/?([0-9]{1,})/?$';
 		$commentregex = 'comment-page-([0-9]{1,})/?$';
 
 		//build up an array of endpoint regexes to append => queries to append