diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 46eba49a173..1d889a473db 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -730,6 +730,12 @@ function main_upgrade($oldversion=0) {
         rebuild_course_cache();
     }
 
+    if ($oldversion < 2004042700) {
+        table_column("user",   "lang", "lang", "varchar", "10", "", "en");
+        table_column("groups", "lang", "lang", "varchar", "10", "", "");
+        table_column("course", "lang", "lang", "varchar", "10", "", "");
+    }
+
     return $result;
 
 }
diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 877abbb0ef9..033d129e85d 100644
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -54,7 +54,7 @@ CREATE TABLE `prefix_course` (
   `visible` int(10) unsigned NOT NULL default '1',
   `groupmode` int(4) unsigned NOT NULL default '0',
   `groupmodeforce` int(4) unsigned NOT NULL default '0',
-  `lang` varchar(5) NOT NULL default '',
+  `lang` varchar(10) NOT NULL default '',
   `timecreated` int(10) unsigned NOT NULL default '0',
   `timemodified` int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
@@ -319,7 +319,7 @@ CREATE TABLE `prefix_user` (
   `address` varchar(70) default NULL,
   `city` varchar(20) default NULL,
   `country` char(2) default NULL,
-  `lang` char(5) default 'en',
+  `lang` varchar(10) default 'en',
   `timezone` float NOT NULL default '99',
   `firstaccess` int(10) unsigned NOT NULL default '0',
   `lastaccess` int(10) unsigned NOT NULL default '0',
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 587d6b8c393..592ae8ee666 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -475,6 +475,12 @@ function main_upgrade($oldversion=0) {
         rebuild_course_cache();
     }
 
+    if ($oldversion < 2004042700) {
+        table_column("user",   "lang", "lang", "varchar", "10", "", "en");
+        table_column("groups", "lang", "lang", "varchar", "10", "", "");
+        table_column("course", "lang", "lang", "varchar", "10", "", "");
+    }
+
     return $result;
 
 }
diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 0d8c57ace63..95b544e0bf1 100644
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -32,7 +32,7 @@ CREATE TABLE prefix_course (
    visible integer NOT NULL default '1',
    groupmode integer NOT NULL default '0',
    groupmodeforce integer NOT NULL default '0',
-   lang varchar(5) NOT NULL default '',
+   lang varchar(10) NOT NULL default '',
    timecreated integer NOT NULL default '0',
    timemodified integer NOT NULL default '0'
 );
@@ -209,7 +209,7 @@ CREATE TABLE prefix_user (
    address varchar(70) default NULL,
    city varchar(20) default NULL,
    country char(2) default NULL,
-   lang varchar(5) NOT NULL default '',
+   lang varchar(10) NOT NULL default '',
    timezone float NOT NULL default '99',
    firstaccess integer NOT NULL default '0',
    lastaccess integer NOT NULL default '0',
diff --git a/version.php b/version.php
index 44dd65037a3..d80504e90f7 100644
--- a/version.php
+++ b/version.php
@@ -5,7 +5,7 @@
 // database to determine whether upgrades should
 // be performed (see lib/db/*.php)
 
-$version = 2004042600;   // The current version is a date (YYYYMMDDXX)
+$version = 2004042700;   // The current version is a date (YYYYMMDDXX)
 
 $release = "1.3 development";   // User-friendly version number