diff --git a/lib/db/install.xml b/lib/db/install.xml
index 5ead98106bd48..7ff1936c781a4 100644
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -1405,6 +1405,7 @@
       </KEYS>
       <INDEXES>
         <INDEX NAME="questionusageid-slot" UNIQUE="true" FIELDS="questionusageid, slot"/>
+        <INDEX NAME="behaviour" UNIQUE="false" FIELDS="behaviour" COMMENT="Required because we need to be able to determine efficiently which behaviours are in use."/>
       </INDEXES>
     </TABLE>
     <TABLE NAME="question_attempt_steps" COMMENT="Stores one step in in a question attempt. As well as the data here, the step will have some data in the question_attempt_step_data table.">
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index dbc25dcc614bc..34b99de8cea83 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -3003,5 +3003,20 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2013111804.03);
     }
 
+    if ($oldversion < 2013111804.06) {
+
+        // Define index behaviour (not unique) to be added to question_attempts.
+        $table = new xmldb_table('question_attempts');
+        $index = new xmldb_index('behaviour', XMLDB_INDEX_NOTUNIQUE, array('behaviour'));
+
+        // Conditionally launch add index behaviour.
+        if (!$dbman->index_exists($table, $index)) {
+            $dbman->add_index($table, $index);
+        }
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2013111804.06);
+    }
+
     return true;
 }
diff --git a/version.php b/version.php
index b4713f323cae4..188226333ce41 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2013111804.05;              // 20131118      = branching date YYYYMMDD - do not modify!
+$version  = 2013111804.06;              // 20131118      = branching date YYYYMMDD - do not modify!
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.