diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php
index c4d26491b48..6768346dab3 100644
--- a/mod/forum/db/upgrade.php
+++ b/mod/forum/db/upgrade.php
@@ -110,12 +110,11 @@ function xmldb_forum_upgrade($oldversion) {
                     JOIN {forum} f ON f.id = d.forum
                     JOIN {modules} m ON m.name = 'forum'
                     JOIN {course_modules} cm ON (cm.module = m.id AND cm.instance = f.id)
-                   WHERE p.attachment <> '$empty' AND p.attachment <> '1'
-                ORDER BY f.course, f.id, d.id";
+                   WHERE p.attachment <> '$empty' AND p.attachment <> '1'";
 
         $count = $DB->count_records_sql("SELECT COUNT('x') $sqlfrom");
 
-        if ($rs = $DB->get_recordset_sql("SELECT p.id, p.attachment, d.forum, f.course, cm.id AS cmid $sqlfrom")) {
+        if ($rs = $DB->get_recordset_sql("SELECT p.id, p.attachment, d.forum, f.course, cm.id AS cmid $sqlfrom ORDER BY f.course, f.id, d.id")) {
 
             $pbar = new progress_bar('migrateforumfiles', 500, true);
 
diff --git a/mod/forum/version.php b/mod/forum/version.php
index ff857c550f9..0503f290e71 100644
--- a/mod/forum/version.php
+++ b/mod/forum/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2008081800;
+$module->version  = 2008081900;
 $module->requires = 2008081600;  // Requires this Moodle version
 $module->cron     = 60;