diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index fc3698e4b4..705f8b6643 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -73,7 +73,7 @@ $mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>='
 switch ( $step ) :
 	case 0:
 		$goback = stripslashes( wp_get_referer() );
-		$goback = esc_url_raw( $goback );
+		$goback = esc_url( $goback );
 		$goback = urlencode( $goback );
 ?>
 <h2><?php _e( 'Database Update Required' ); ?></h2>
@@ -86,7 +86,7 @@ switch ( $step ) :
 		wp_upgrade();
 
 			$backto = !empty($_GET['backto']) ? stripslashes( urldecode( $_GET['backto'] ) ) :  __get_option( 'home' ) . '/';
-			$backto = esc_url_raw( $backto );
+			$backto = esc_url( $backto );
 			$backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
 ?>
 <h2><?php _e( 'Update Complete' ); ?></h2>
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 0d582bf11c..434d2217a9 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -2413,7 +2413,7 @@ function wp_shortlink_wp_head() {
 	if ( empty( $shortlink ) )
 		return;
 
-	echo "<link rel='shortlink' href='" . esc_url_raw( $shortlink ) . "' />\n";
+	echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
 }
 
 /**