Index: src/wp-includes/canonical.php
===================================================================
--- src/wp-includes/canonical.php	(revision 28220)
+++ src/wp-includes/canonical.php	(working copy)
@@ -271,9 +271,9 @@
 				$paged = get_query_var('paged');
 				$redirect['query'] = remove_query_arg( 'paged', $redirect['query'] );
 				if ( !is_feed() ) {
-					if ( $paged > 1 && !is_single() ) {
+					if ( $paged > 1 && !is_singular() ) {
 						$addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit("$wp_rewrite->pagination_base/$paged", 'paged');
-					} elseif ( !is_single() ) {
+					} elseif ( !is_singular() ) {
 						$addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
 					}
 				} elseif ( $paged > 1 ) {