diff --git a/mod/wiki/db/upgrade.php b/mod/wiki/db/upgrade.php
index 992571149aa..b5289585b7a 100644
--- a/mod/wiki/db/upgrade.php
+++ b/mod/wiki/db/upgrade.php
@@ -48,6 +48,27 @@ function xmldb_wiki_upgrade($oldversion) {
     // Moodle v2.3.0 release upgrade line
     // Put any upgrade step following this
 
+    if ($oldversion < 2012061701) {
+        // Drop all legacy upgrade tables, not used anymore.
+
+        $table = new xmldb_table('wiki_entries_old');
+        if ($dbman->table_exists('wiki_entries_old')) {
+            $dbman->drop_table($table);
+        }
+
+        $table = new xmldb_table('wiki_locks_old');
+        if ($dbman->table_exists('wiki_locks_old')) {
+            $dbman->drop_table($table);
+        }
+
+        $table = new xmldb_table('wiki_pages_old');
+        if ($dbman->table_exists('wiki_pages_old')) {
+            $dbman->drop_table($table);
+        }
+
+        upgrade_plugin_savepoint(true, 2012061701, 'mod', 'wiki');
+    }
+
 
     return true;
 }
diff --git a/mod/wiki/version.php b/mod/wiki/version.php
index db01d6224b7..0c22ff34f0b 100644
--- a/mod/wiki/version.php
+++ b/mod/wiki/version.php
@@ -33,7 +33,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$module->version   = 2012061700;       // The current module version (Date: YYYYMMDDXX)
+$module->version   = 2012061701;       // The current module version (Date: YYYYMMDDXX)
 $module->requires  = 2012061700;    // Requires this Moodle version
 $module->component = 'mod_wiki';       // Full name of the plugin (used for diagnostics)
 $module->cron      = 0;