diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 6c5e79338e2..841b4db07a7 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1,19 +1,9 @@
 <?PHP  //$Id$
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle.
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by /version.php
 //
 // This file is tailored to MySQL
 
@@ -2335,6 +2325,8 @@ function main_upgrade($oldversion=0) {
         table_column('log_display', 'field', 'field', 'varchar', '200', '', '', 'not null', '');
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     return $result;
 }
 
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 348fba09214..b2a4c1c3f71 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1,19 +1,8 @@
 <?PHP  //$Id$
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle.
-// 
-// Sometimes, changes between versions involve 
-// alterations to database structures and other 
-// major things that may break installations.  
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it 
-// will tell you what you need to do.
-//
-// Versions are defined by /version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to PostgreSQL 7
 
@@ -1960,6 +1949,8 @@ function main_upgrade($oldversion=0) {
             table_column('log_display', 'field', 'field', 'varchar', '200', '', '', 'not null', '');
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     return $result;
 }
 
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
new file mode 100644
index 00000000000..ffa6cc3eeca
--- /dev/null
+++ b/lib/db/upgrade.php
@@ -0,0 +1,39 @@
+<?PHP  //$Id$
+
+// This file keeps track of upgrades to Moodle.
+//
+// Sometimes, changes between versions involve
+// alterations to database structures and other
+// major things that may break installations.
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it
+// will tell you what you need to do.
+//
+// The commands in here will all be database-neutral,
+// using the functions defined in lib/ddllib.php
+
+
+function xmldb_main_upgrade($oldversion=0) {
+
+    global $CFG, $THEME, $db;
+
+    $result = true;
+
+    if ($oldversion < 2006100401) {
+        /// Only for those tracking Moodle 1.7 dev, others will have these dropped in moodle_install_roles()
+        if (!empty($CFG->rolesactive)) {   
+            drop_table('user_students');
+            drop_table('user_teachers');
+            drop_table('user_coursecreators');
+            drop_table('user_admins');
+        }
+    }
+
+    return $result;
+}
+
+?>
diff --git a/version.php b/version.php
index f37f04ae239..ca1728fa87d 100644
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2006092801;  // YYYYMMDD = date
+   $version = 2006100401;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.7 dev';    // Human-friendly version name