diff --git a/src/wp-content/themes/twentyten/loop.php b/src/wp-content/themes/twentyten/loop.php
index e1348f3122b29..758342a3a67ff 100644
--- a/src/wp-content/themes/twentyten/loop.php
+++ b/src/wp-content/themes/twentyten/loop.php
@@ -20,10 +20,25 @@
 ?>
 
 <?php // Display navigation to next/previous pages when applicable. ?>
-<?php if ( $wp_query->max_num_pages > 1 ) : ?>
+<?php
+if ( $wp_query->max_num_pages > 1 ) :
+	$order   = get_query_var( 'order', 'DESC' );
+	$is_desc = ( 'DESC' === $order );
+
+	$new_posts_text = __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' );
+	$old_posts_text = __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' );
+
+	$prev_link = $is_desc ? get_next_posts_link( $old_posts_text ) : get_previous_posts_link( $old_posts_text );
+	$next_link = $is_desc ? get_previous_posts_link( $new_posts_text ) : get_next_posts_link( $new_posts_text );
+	?>
 	<div id="nav-above" class="navigation">
-		<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
-		<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
+	<?php if ( $prev_link ) : ?>
+		<div class="nav-previous"><?php echo wp_kses_post( $prev_link ); ?></div>
+	<?php endif; ?>
+
+	<?php if ( $next_link ) : ?>
+		<div class="nav-next"><?php echo wp_kses_post( $next_link ); ?></div>
+	<?php endif; ?>
 	</div><!-- #nav-above -->
 <?php endif; ?>
 
@@ -205,7 +220,12 @@
 <?php // Display navigation to next/previous pages when applicable. ?>
 <?php if ( $wp_query->max_num_pages > 1 ) : ?>
 				<div id="nav-below" class="navigation">
-					<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
-					<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
+				<?php if ( $prev_link ) : ?>
+					<div class="nav-previous"><?php echo wp_kses_post( $prev_link ); ?></div>
+				<?php endif; ?>
+
+				<?php if ( $next_link ) : ?>
+					<div class="nav-next"><?php echo wp_kses_post( $next_link ); ?></div>
+				<?php endif; ?>
 				</div><!-- #nav-below -->
 <?php endif; ?>