diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index f833680fd70..f7d0cbada21 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1225,6 +1225,11 @@ function main_upgrade($oldversion=0) {
         table_column('user', '', 'skype', 'varchar', '50', '', '', '', 'icq');
     }
 
+    if ($oldversion < 2005032300) {
+        table_column('user', 'dstpreset', 'timezonename', 'varchar', '100');
+        execute_sql('UPDATE `'.$CFG->prefix.'user` SET timezonename = \'\'');
+    }
+
     return $result;
 }
 
diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 743278048e5..841fc038cf7 100644
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -457,7 +457,7 @@ CREATE TABLE `prefix_user` (
   `lang` varchar(10) default 'en',
   `theme` varchar(50) NOT NULL default '',
   `timezone` float NOT NULL default '99',
-  `dstpreset` int(10) NOT NULL default '0',
+  `timezonename` varchar(100) NOT NULL default '',
   `firstaccess` int(10) unsigned NOT NULL default '0',
   `lastaccess` int(10) unsigned NOT NULL default '0',
   `lastlogin` int(10) unsigned NOT NULL default '0',
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 72d89c33c77..5672fa76c2e 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -944,6 +944,11 @@ function main_upgrade($oldversion=0) {
         table_column('user', '', 'skype', 'varchar', '50', '', '', '', 'icq');
     }
 
+    if ($oldversion < 2005032300) {
+        table_column('user', 'dstpreset', 'timezonename', 'varchar', '100');
+        execute_sql('UPDATE `'.$CFG->prefix.'user` SET timezonename = \'\'');
+    }
+
     return $result;
 }
 
diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 91b4c1e8f3a..d2a4272dbea 100644
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -321,7 +321,7 @@ CREATE TABLE prefix_user (
    lang varchar(10) NOT NULL default '',
    theme varchar(50) NOT NULL default '',
    timezone float NOT NULL default '99',
-   dstpreset integer NOT NULL default '0',
+   timezonename varchar(100) NOT NULL default '',
    firstaccess integer NOT NULL default '0',
    lastaccess integer NOT NULL default '0',
    lastlogin integer NOT NULL default '0',
diff --git a/version.php b/version.php
index de89bf2e3e5..81d3f2548eb 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 = 2005031000;  // YYYYMMDD = date 
+   $version = 2005032300;  // YYYYMMDD = date 
                            //       XY = increments within a single day
 
    $release = '1.5 UNSTABLE DEVELOPMENT';    // Human-friendly version name