diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 116829374..503e4ed2d 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -18,9 +18,9 @@ if ( defined('ABSPATH') )
 else
 	require_once('../wp-load.php');
 
-if ( get_option('db_version') == 'db_upgraded' ) {
+if ( get_option('db_upgraded') ) {
 	$wp_rewrite->flush_rules();
-	update_option('db_version', $wp_db_version);
+	update_option( 'db_upgraded',  false );
 
 	/**
 	 * Runs on the next page load after successful upgrade
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 13a1f6fe8..8b76c7d34 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -344,7 +344,8 @@ function upgrade_all() {
 
 	maybe_disable_automattic_widgets();
 
-	update_option('db_version', 'db_upgraded');
+	update_option( 'db_version', $wp_db_version );
+	update_option( 'db_upgraded', true );
 }
 
 /**