diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 32ca6ea3b25..7d822226991 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -50,6 +50,12 @@ function xmldb_main_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2006101001) {         /// Disable the LAMS module by default
+        if (!count_records('lams')) {
+            set_field('modules', 'visible', 0, 'name', 'lams');  // Disable it by default
+        }
+    }
+
     return $result;
 }
 
diff --git a/mod/lams/defaults.php b/mod/lams/defaults.php
new file mode 100644
index 00000000000..38545d7f266
--- /dev/null
+++ b/mod/lams/defaults.php
@@ -0,0 +1,8 @@
+<?php   // LAMS is disabled by default
+    if (empty($CFG->lams_initialdisable)) {
+        if (!count_records('lams')) {
+            set_field('modules', 'visible', 0, 'name', 'lams');  // Disable it by default
+            set_config('lams_initialdisable', 1);
+        }
+    }
+?>
diff --git a/version.php b/version.php
index 7f7bf0326fa..216426905a2 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 = 2006101001;  // YYYYMMDD = date
+   $version = 2006102200;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.8 dev';    // Human-friendly version name