diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index 168a7c3c2d..2623242d79 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -175,6 +175,8 @@ function upgrade_all() {
 		upgrade_110();
 		upgrade_130();
 	}
+	
+	maybe_disable_automattic_widgets();
 
 	if ( $wp_current_db_version < 3308 )
 		upgrade_160();
@@ -1099,4 +1101,13 @@ function wp_check_mysql_version() {
 		die(sprintf(__('<strong>ERROR</strong>: WordPress %s requires MySQL 4.0.0 or higher'), $wp_version));
 }
 
-?>
+function maybe_disable_automattic_widgets() {
+	$plugins = __get_option( 'active_plugins' );
+	
+	if ( in_array( 'widgets/widgets.php', $plugins ) ) {
+		array_splice( $plugins, array_search( 'widgets/widgets.php', $plugins ), 1 );
+		update_option( 'active_plugins', $plugins );
+	}
+}
+
+?>
\ No newline at end of file