diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index a2ce5c13e..e18cf51c3 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -172,6 +172,16 @@ $current_screen->parent_base = str_replace('.php', '', $current_screen->parent_b
 <?php
 screen_meta($current_screen);
 
+if ( is_multisite() ) {
+	if ( is_network_admin() )
+		do_action('network_admin_notices');
+	else
+		do_action('site_admin_notices');
+} else {
+	do_action('network_admin_notices');
+	do_action('site_admin_notices');
+}
+
 do_action('admin_notices');
 
 if ( $parent_file == 'options-general.php' )
diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index 8009d7d29..22a725351 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -731,7 +731,7 @@ function site_admin_notice() {
 	if ( !is_super_admin() )
 		return false;
 	if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
-		echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Update Network</a> page to update all your sites.' ), esc_url( admin_url( 'ms-upgrade-network.php' ) ) ) . "</div>";
+		echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Update Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "</div>";
 }
 add_action( 'admin_notices', 'site_admin_notice' );
 
diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php
index eb61e91a4..9ea1e6b78 100644
--- a/wp-admin/network/upgrade.php
+++ b/wp-admin/network/upgrade.php
@@ -62,7 +62,7 @@ switch ( $action ) {
 			do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
 		}
 		echo "</ul>";
-		?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="ms-upgrade-network.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
+		?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="upgrade.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
 		<script type='text/javascript'>
 		<!--
 		function nextpage() {