Index: wp-admin/admin.php
===================================================================
--- wp-admin/admin.php	(revision 3935)
+++ wp-admin/admin.php	(working copy)
@@ -4,9 +4,11 @@
 else
     require_once('../wp-config.php');
 
-if ( get_option('db_version') != $wp_db_version )
-	die (sprintf(__("Your database is out-of-date.  Please <a href='%s'>upgrade</a>."), get_option('siteurl') . '/wp-admin/upgrade.php'));
-    
+if ( get_option('db_version') != $wp_db_version ) {
+	wp_redirect(add_query_arg('_wp_http_referer', $_SERVER['REQUEST_URI'], get_option('siteurl') . '/wp-admin/upgrade.php'));
+	die();
+}
+
 require_once(ABSPATH . 'wp-admin/admin-functions.php');
 require_once(ABSPATH . 'wp-admin/admin-db.php');
 require_once(ABSPATH . WPINC . '/registration.php');
Index: wp-admin/upgrade.php
===================================================================
--- wp-admin/upgrade.php	(revision 3935)
+++ wp-admin/upgrade.php	(working copy)
@@ -64,12 +64,16 @@
 <body>
 <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
 <?php
+if ( get_option('db_version') != $wp_db_version ) : // upgrade needs to be run
+
 switch($step) {
 
 	case 0:
 	$goback = wp_specialchars(wp_get_referer());
-?> 
-<p><?php _e('This file upgrades you from any previous version of WordPress to the latest. It may take a while though, so be patient.'); ?></p> 
+?>
+<h2><?php _e('Database Upgrade'); ?></h2>
+<p><?php _e('Your WordPress database is out-of-date, and must be upgraded before you can continue.'); ?></p>
+<p><?php _e('Click the "Upgrade WordPress" link to upgrade your WordPress database.  This process may take a while, so please be patient.'); ?></p>
 	<h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress &raquo;'); ?></a></h2>
 <?php
 	break;
@@ -82,8 +86,8 @@
 	else
 		$backto = wp_specialchars( $_GET['backto'] , 1 );
 ?> 
-<h2><?php _e('Step 1'); ?></h2> 
-	<p><?php printf(__("There's actually only one step. So if you see this, you're done. <a href='%s'>Have fun</a>!"),  $backto); ?></p>
+<h2><?php _e('Upgrade Complete'); ?></h2>
+	<p><?php printf(__("Your WordPress database has been successfully upgraded. <a href='%s'>Have fun</a>!"),  $backto); ?></p>
 
 <!--
 <pre>
@@ -96,6 +100,10 @@
 <?php
 	break;
 }
-?> 
+
+else : // upgrade doesn't need to be run ?>
+	<h2><?php _e('No Upgrade Necessary'); ?></h2>
+	<p><?php _e('Your WordPress database is already up-to-date.'); ?></p>
+<?php endif; ?>
 </body>
-</html>
+</html>
\ No newline at end of file
