diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index f7d0cbada21..6cbec46e0eb 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1230,6 +1230,29 @@ function main_upgrade($oldversion=0) {
         execute_sql('UPDATE `'.$CFG->prefix.'user` SET timezonename = \'\'');
     }
 
+    if ($oldversion < 2005032600) {
+        execute_sql('DROP TABLE '.$CFG->prefix.'dst_preset', false);
+        modify_database('',"CREATE TABLE `prefix_timezone` (
+                              `id` int(10) NOT NULL auto_increment,
+                              `name` varchar(100) NOT NULL default '',
+                              `year` int(11) NOT NULL default '0',
+                              `rule` varchar(20) NOT NULL default '',
+                              `gmtoff` int(11) NOT NULL default '0',
+                              `dstoff` int(11) NOT NULL default '0',
+                              `dst_month` tinyint(2) NOT NULL default '0',
+                              `dst_startday` tinyint(3) NOT NULL default '0',
+                              `dst_weekday` tinyint(3) NOT NULL default '0',
+                              `dst_skipweeks` tinyint(3) NOT NULL default '0',
+                              `dst_time` varchar(5) NOT NULL default '00:00',
+                              `std_month` tinyint(2) NOT NULL default '0',
+                              `std_startday` tinyint(3) NOT NULL default '0',
+                              `std_weekday` tinyint(3) NOT NULL default '0',
+                              `std_skipweeks` tinyint(3) NOT NULL default '0',
+                              `std_time` varchar(5) NOT NULL default '00:00',
+                              PRIMARY KEY (`id`)
+                            ) TYPE=MyISAM COMMENT='Rules for calculating local wall clock time for users';");
+    }
+
     return $result;
 }
 
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 5672fa76c2e..9adbaf65282 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -949,6 +949,28 @@ function main_upgrade($oldversion=0) {
         execute_sql('UPDATE `'.$CFG->prefix.'user` SET timezonename = \'\'');
     }
 
+    if ($oldversion < 2005032600) {
+        execute_sql('DROP TABLE '.$CFG->prefix.'dst_preset', false);
+        modify_database('',"CREATE TABLE prefix_timezone (
+                              id SERIAL PRIMARY KEY,
+                              name varchar(100) NOT NULL default '',
+                              year integer NOT NULL default '0',
+                              rule varchar(20) NOT NULL default '',
+                              gmtoff integer NOT NULL default '0',
+                              dstoff integer NOT NULL default '0',
+                              dst_month integer NOT NULL default '0',
+                              dst_startday integer NOT NULL default '0',
+                              dst_weekday integer NOT NULL default '0',
+                              dst_skipweeks integer NOT NULL default '0',
+                              dst_time varchar(5) NOT NULL default '00:00',
+                              std_month integer NOT NULL default '0',
+                              std_startday integer NOT NULL default '0',
+                              std_weekday integer NOT NULL default '0',
+                              std_skipweeks integer NOT NULL default '0',
+                              std_time varchar(5) NOT NULL default '00:00'
+                            );");
+    }
+
     return $result;
 }
 
diff --git a/version.php b/version.php
index 81d3f2548eb..9f5f5595e00 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 = 2005032300;  // YYYYMMDD = date 
+   $version = 2005032600;  // YYYYMMDD = date 
                            //       XY = increments within a single day
 
    $release = '1.5 UNSTABLE DEVELOPMENT';    // Human-friendly version name