diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 7dee7a77347..f3f33290834 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -1517,5 +1517,19 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2012120300.01);
     }
 
+    if ($oldversion < 2012120300.04) {
+        // Remove "_utf8" suffix from all langs in course table.
+        $langs = $DB->get_records_sql("SELECT DISTINCT lang FROM {course} WHERE lang LIKE ?", array('%_utf8'));
+
+        foreach ($langs as $lang=>$unused) {
+            $newlang = str_replace('_utf8', '', $lang);
+            $sql = "UPDATE {course} SET lang = :newlang WHERE lang = :lang";
+            $DB->execute($sql, array('newlang'=>$newlang, 'lang'=>$lang));
+        }
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2012120300.04);
+    }
+
     return true;
 }
diff --git a/version.php b/version.php
index 60a744833bb..237f8dd6861 100644
--- a/version.php
+++ b/version.php
@@ -30,7 +30,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-$version  = 2012120300.03;              // 20121203      = branching date YYYYMMDD - do not modify!
+$version  = 2012120300.04;              // 20121203      = branching date YYYYMMDD - do not modify!
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes