diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php
index bc0bee07b12..61305afa38b 100644
--- a/mod/quiz/db/upgrade.php
+++ b/mod/quiz/db/upgrade.php
@@ -186,6 +186,16 @@ function xmldb_quiz_upgrade($oldversion) {
         upgrade_mod_savepoint($result, 2008082200, 'quiz');
     }
 
+    /// Now that the quiz is no longer responsible for creating all the question
+    /// bank tables, and some of the tables are now the responsibility of the
+    /// datasetdependent question type, which did not have a version.php file before,
+    /// we need to say that these tables are already installed, otherwise XMLDB
+    /// will try to create them again and give an error.
+    if ($result && $oldversion < 2008082600) {
+        set_config('qtype_datasetdependent_version', 2008082600);
+        upgrade_mod_savepoint($result, 2008082600, 'quiz');
+    }
+
     return $result;
 }
 
diff --git a/mod/quiz/version.php b/mod/quiz/version.php
index a4756d62f1e..b964a6f4ef5 100644
--- a/mod/quiz/version.php
+++ b/mod/quiz/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2008082200;   // The (date) version of this module
+$module->version  = 2008082600;   // The (date) version of this module
 $module->requires = 2008072401;   // Requires this Moodle version
 $module->cron     = 0;            // How often should cron check this module (seconds)?
 
diff --git a/question/type/datasetdependent/version.php b/question/type/datasetdependent/version.php
new file mode 100644
index 00000000000..f15f65b36f2
--- /dev/null
+++ b/question/type/datasetdependent/version.php
@@ -0,0 +1,6 @@
+<?PHP // $Id$
+
+$plugin->version  = 2008082600;
+$plugin->requires = 2007101000;
+
+?>