diff --git a/mod/attendance/db/mysql.php b/mod/attendance/db/mysql.php
index 7fa84dbc55b..8fe7574fefe 100644
--- a/mod/attendance/db/mysql.php
+++ b/mod/attendance/db/mysql.php
@@ -20,7 +20,11 @@ function attendance_upgrade($oldversion) {
         modify_database("", "INSERT INTO {$CFG->prefix}log_display VALUES ('attendance', 'viewweek', 'attendance', 'name');");
     }
 
-
+    if ($oldversion < 2004111200) {
+        modify_database('','ALTER TABLE prefix_attendance ADD INDEX course (course);');
+        modify_database('','ALTER TABLE prefix_attendance_roll ADD INDEX dayid (dayid);');
+        modify_database('','ALTER TABLE prefix_attendance_roll ADD INDEX userid (userid);');
+    }
 
     return true;
 }
diff --git a/mod/attendance/db/mysql.sql b/mod/attendance/db/mysql.sql
index c559b9256b0..d37523571f0 100755
--- a/mod/attendance/db/mysql.sql
+++ b/mod/attendance/db/mysql.sql
@@ -14,7 +14,8 @@ CREATE TABLE prefix_attendance (
   dynsection tinyint(1) NOT NULL default '0',
   edited tinyint(1) NOT NULL default '0',
   autoattend tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (id)
+  PRIMARY KEY  (id),
+  KEY `course` (`course`) 
 ) TYPE=MyISAM;
 
 #
@@ -28,5 +29,7 @@ CREATE TABLE prefix_attendance_roll (
   hour tinyint(1) unsigned NOT NULL default '0',
   status int(11) NOT NULL default '0',
   notes varchar(64) NOT NULL default '',
-  PRIMARY KEY  (id)
+  PRIMARY KEY  (id),
+  KEY `dayid` (`dayid`),
+  KEY `userid` (`userid`)
 ) TYPE=MyISAM;
diff --git a/mod/attendance/db/postgres7.php b/mod/attendance/db/postgres7.php
index 6f4af9fdb59..35aeedba3d1 100644
--- a/mod/attendance/db/postgres7.php
+++ b/mod/attendance/db/postgres7.php
@@ -18,6 +18,12 @@ function attendance_upgrade($oldversion) {
         table_column("attendance", "", "autoattend", "integer", 2, "unsigned", "0", "not null");
     }
 
+    if ($oldversion < 2004111200) {
+        modify_database('','CREATE INDEX prefix_attendance_course_idx ON prefix_attendance (course);');
+        modify_database('','CREATE INDEX prefix_attendance_roll_dayid_idx ON prefix_attendance_roll (dayid);');
+        modify_database('','CREATE INDEX prefix_attendance_roll_userid_idx ON prefix_attendance_roll (userid);');
+    }
+
     return true;
 }
 
diff --git a/mod/attendance/db/postgres7.sql b/mod/attendance/db/postgres7.sql
index 170336037c9..e1c20fe068e 100644
--- a/mod/attendance/db/postgres7.sql
+++ b/mod/attendance/db/postgres7.sql
@@ -17,6 +17,8 @@ CREATE TABLE prefix_attendance (
   PRIMARY KEY(id)
 );
 
+CREATE INDEX prefix_attendance_course_idx ON prefix_attendance (course);
+
 #
 # Table structure for table `prefix_attendance_roll`
 #
@@ -30,3 +32,6 @@ CREATE TABLE prefix_attendance_roll (
   notes varchar(64) NOT NULL default '',
   PRIMARY KEY  (id)
 );
+
+CREATE INDEX prefix_attendance_roll_dayid_idx ON prefix_attendance_roll (dayid);
+CREATE INDEX prefix_attendance_roll_userid_idx ON prefix_attendance_roll (userid);
\ No newline at end of file
diff --git a/mod/attendance/version.php b/mod/attendance/version.php
index c9038f4a6c3..0765fc356c7 100644
--- a/mod/attendance/version.php
+++ b/mod/attendance/version.php
@@ -5,7 +5,7 @@
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2004060400;  // The current module version (Date: YYYYMMDDXX)
+$module->version  = 2004111200;  // The current module version (Date: YYYYMMDDXX)
 $module->requires = 2004052505;  // Requires this Moodle version
 $module->cron     = 3600;        // Period for cron to check this module (secs)