diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index c4aa7d95cf1..2ab01fac72c 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -692,6 +692,11 @@ function xmldb_main_upgrade($oldversion=0) {
         }
     }
 
+    if ($result && $oldversion < 2007021511) {
+        // Small update of guest user to be 100% sure it has the correct mnethostid (MDL-10375)
+        set_field('user', 'mnethostid', $CFG->mnet_localhost_id, 'username', 'guest');
+    }
+
     return $result;
 
 }
diff --git a/version.php b/version.php
index b1b7485af20..8be9b806489 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 = 2007021510;   // YYYYMMDD   = date of the 1.8 branch (don't change)
+   $version = 2007021511;   // YYYYMMDD   = date of the 1.8 branch (don't change)
                             //         X  = release number 1.8.[0,1,2,3...]
                             //          Y = micro-increments between releases