diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index be86875d4b..fe1e74af16 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -195,6 +195,9 @@ function upgrade_all() {
 	if ( $wp_current_db_version < 5539 )
 		upgrade_230();
 
+	if ( $wp_current_db_version < 6124 )
+		upgrade_230_old_tables();
+
 	maybe_disable_automattic_widgets();
 
 	$wp_rewrite->flush_rules();
@@ -693,6 +696,13 @@ function upgrade_230_options_table() {
 	$wpdb->show_errors();
 }
 
+function upgrade_230_old_tables() {
+	global $wpdb;
+	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'categories');
+	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'link2cat');
+	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'post2cat');
+}
+
 function upgrade_old_slugs() {
 	// upgrade people who were using the Redirect Old Slugs plugin
 	global $wpdb;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e3d4631359..3853ac7c3a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -3,6 +3,6 @@
 // This holds the version number in a separate file so we can bump it without cluttering the SVN
 
 $wp_version = '2.3-beta3';
-$wp_db_version = 6075;
+$wp_db_version = 6124;
 
 ?>