diff --git a/dba/appuser_permissions.txt b/dba/appuser_permissions.txt
index e656429d..f87c83fb 100644
--- a/dba/appuser_permissions.txt
+++ b/dba/appuser_permissions.txt
@@ -45,6 +45,9 @@ GRANT SELECT,INSERT,UPDATE,DELETE
   ON addressbook_address_adr
   ON addressbook_address_tel
   ON addressbook_address_email
+  ON timezones
+  ON tz_aliases
+  ON tz_localnames
 
 GRANT SELECT,UPDATE
   ON relationship_type_rt_id_seq
@@ -54,6 +57,7 @@ GRANT SELECT,UPDATE
   ON session_session_id_seq
   ON principal_type_principal_type_id_seq
   ON sync_tokens_sync_token_seq
+  ON timezones_our_tzno_seq
 
 GRANT SELECT,INSERT
   ON time_zone
diff --git a/dba/patches/1.2.11.sql b/dba/patches/1.2.11.sql
new file mode 100644
index 00000000..d0a5092e
--- /dev/null
+++ b/dba/patches/1.2.11.sql
@@ -0,0 +1,48 @@
+
+-- Minor enhancement:	Add columns to time_zone table to support timezone protocol changes.
+
+BEGIN;
+SELECT check_db_revision(1,2,10);
+
+CREATE TABLE timezones (
+  our_tzno SERIAL PRIMARY KEY,
+  tzid TEXT UNIQUE NOT NULL,
+  olson_name TEXT,
+  active BOOLEAN,
+  last_modified TIMESTAMP DEFAULT current_timestamp,
+  vtimezone TEXT
+);
+
+CREATE TABLE tz_aliases (
+  our_tzno INT8 REFERENCES timezones(our_tzno),
+  tzalias TEXT NOT NULL
+);
+
+CREATE TABLE tz_localnames (
+  our_tzno INT8 REFERENCES timezones(our_tzno),
+  locale TEXT NOT NULL,
+  localised_name TEXT NOT NULL,
+  preferred BOOLEAN DEFAULT TRUE
+);
+
+
+-- Let's assume that all timezone definitions currently present are old, and
+-- we can find newer ones.  We don't really want the service feeding them out
+-- so we'll mark them inactive as well.
+INSERT INTO timezones (tzid, olson_name, active, last_modified, vtimezone )
+	SELECT tz_id, tz_locn, false, '1970-01-01T00:00:00Z', tz_spec FROM time_zone;
+INSERT INTO tz_aliases (our_tzno, tzalias)
+    SELECT timezones.our_tzno, tz_locn FROM time_zone LEFT JOIN timezones ON (tz_id = tzid)
+    									 WHERE tz_locn IS NOT NULL AND tz_locn != '';
+
+DROP TABLE time_zone CASCADE;
+ALTER TABLE calendar_item ADD CONSTRAINT "calendar_item_tz_id_fkey" FOREIGN KEY (tz_id) REFERENCES timezones(tzid)
+    ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
+ALTER TABLE collection ADD CONSTRAINT "collection_timezone_fkey" FOREIGN KEY (timezone) REFERENCES timezones(tzid)
+    ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE;
+
+SELECT new_db_revision(1,2,11, 'Novembre' );
+
+COMMIT;
+ROLLBACK;
+
diff --git a/inc/DAVResource.php b/inc/DAVResource.php
index cc7a366a..1847585d 100644
--- a/inc/DAVResource.php
+++ b/inc/DAVResource.php
@@ -327,9 +327,9 @@ class DAVResource
     $base_sql = 'SELECT collection.*, path_privs(:session_principal::int8, collection.dav_name,:scan_depth::int), ';
     $base_sql .= 'p.principal_id, p.type_id AS principal_type_id, ';
     $base_sql .= 'p.displayname AS principal_displayname, p.default_privileges AS principal_default_privileges, ';
-    $base_sql .= 'time_zone.tz_spec ';
+    $base_sql .= 'timezones.vtimezone ';
     $base_sql .= 'FROM collection LEFT JOIN principal p USING (user_no) ';
-    $base_sql .= 'LEFT JOIN time_zone ON (collection.timezone=time_zone.tz_id) ';
+    $base_sql .= 'LEFT JOIN timezones ON (collection.timezone=timezones.tzid) ';
     $base_sql .= 'WHERE ';
     $sql = $base_sql .'collection.dav_name = :raw_path ';
     $params = array( ':raw_path' => $this->dav_name, ':session_principal' => $session->principal_id, ':scan_depth' => $c->permission_scan_depth );
@@ -405,14 +405,14 @@ EOSQL;
       $sql = <<<EOSQL
 SELECT collection.*, path_privs(:session_principal::int8, collection.dav_name,:scan_depth::int), p.principal_id,
     p.type_id AS principal_type_id, p.displayname AS principal_displayname, p.default_privileges AS principal_default_privileges,
-    time_zone.tz_spec, dav_binding.access_ticket_id, dav_binding.parent_container AS bind_parent_container,
+    timezones.vtimezone, dav_binding.access_ticket_id, dav_binding.parent_container AS bind_parent_container,
 		dav_binding.dav_displayname, owner.dav_name AS bind_owner_url, dav_binding.dav_name AS bound_to,  
     dav_binding.external_url AS external_url, dav_binding.type AS external_type, dav_binding.bind_id AS bind_id 
 FROM dav_binding
     LEFT JOIN collection ON (collection.collection_id=bound_source_id)
     LEFT JOIN principal p USING (user_no)
     LEFT JOIN dav_principal owner ON (dav_binding.dav_owner_id=owner.principal_id)
-    LEFT JOIN time_zone ON (collection.timezone=time_zone.tz_id)
+    LEFT JOIN timezones ON (collection.timezone=timezones.tzid)
  WHERE dav_binding.dav_name = :raw_path
 EOSQL;
       $params = array( ':raw_path' => $this->dav_name, ':session_principal' => $session->principal_id, ':scan_depth' => $c->permission_scan_depth );
@@ -1639,11 +1639,11 @@ EOQRY;
 
       case 'urn:ietf:params:xml:ns:caldav:calendar-timezone':
         if ( ! $this->_is_collection ) return false;
-        if ( !isset($this->collection->tz_spec) || $this->collection->tz_spec == '' ) return false;
+        if ( !isset($this->collection->vtimezone) || $this->collection->vtimezone == '' ) return false;
 
         $cal = new iCalComponent();
         $cal->VCalendar();
-        $cal->AddComponent( new iCalComponent($this->collection->tz_spec) );
+        $cal->AddComponent( new iCalComponent($this->collection->vtimezone) );
         $reply->NSElement($prop, $tag, $cal->Render() );
         break;
 
diff --git a/inc/caldav-PROPPATCH.php b/inc/caldav-PROPPATCH.php
index 381e3c45..890819b0 100644
--- a/inc/caldav-PROPPATCH.php
+++ b/inc/caldav-PROPPATCH.php
@@ -10,7 +10,7 @@
 */
 dbg_error_log("PROPPATCH", "method handler");
 
-require_once('iCalendar.php');
+require_once('vCalendar.php');
 require_once('DAVResource.php');
 
 $dav_resource = new DAVResource($request->path);
@@ -152,11 +152,19 @@ foreach( $setprops AS $k => $setting ) {
       if ( $dav_resource->IsCollection() && $dav_resource->IsCalendar() && ! $dav_resource->IsBinding() ) {
         $tzcomponent = $setting->GetPath('urn:ietf:params:xml:ns:caldav:calendar-timezone');
         $tzstring = $tzcomponent[0]->GetContent();
-        $calendar = new iCalendar( array( 'icalendar' => $tzstring) );
-        $timezones = $calendar->component->GetComponents('VTIMEZONE');
-        if ( $timezones === false || count($timezones) == 0 ) break;
+        $calendar = new vCalendar( $tzstring );
+        $timezones = $calendar->GetComponents('VTIMEZONE');
+        if ( count($timezones) == 0 ) break;
         $tz = $timezones[0];  // Backward compatibility
         $tzid = $tz->GetPValue('TZID');
+        $params = array( ':tzid' => $tzid );
+        $qry = new AwlQuery('SELECT 1 FROM timezones WHERE tzid = :tzid', $params );
+        if ( $qry->Exec('PUT',__LINE__,__FILE__) && $qry->rows() == 0 ) {
+          $params[':olson_name'] = $calendar->GetOlsonName($tz);
+          $params[':vtimezone'] = (isset($tz) ? $tz->Render() : null );
+          $qry->QDo('INSERT INTO timezones (tzid, olson_name, active, vtimezone) VALUES(:tzid,:olson_name,false,:vtimezone)', $params );
+        }
+        
         $qry->QDo('UPDATE collection SET timezone = :tzid WHERE dav_name = :dav_name',
                                        array( ':tzid' => $tzid, ':dav_name' => $dav_resource->dav_name()) );
       }
diff --git a/inc/caldav-PUT-functions.php b/inc/caldav-PUT-functions.php
index b9589127..e19f3d5a 100644
--- a/inc/caldav-PUT-functions.php
+++ b/inc/caldav-PUT-functions.php
@@ -575,11 +575,11 @@ EOSQL;
         $last_tz_locn = $tz_locn;
       }
       $params = array( ':tzid' => $tzid);
-      $qry = new AwlQuery('SELECT tz_locn FROM time_zone WHERE tz_id = :tzid', $params );
+      $qry = new AwlQuery('SELECT 1 FROM timezones WHERE tzid = :tzid', $params );
       if ( $qry->Exec('PUT',__LINE__,__FILE__) && $qry->rows() == 0 ) {
-        $params[':tzlocn'] = $tz_locn;
-        $params[':tzspec'] = (isset($tz) ? $tz->Render() : null );
-        $qry->QDo('INSERT INTO time_zone (tz_id, tz_locn, tz_spec) VALUES(:tzid,:tzlocn,:tzspec)', $params );
+        $params[':olson_name'] = $tz_locn;
+        $params[':vtimezone'] = (isset($tz) ? $tz->Render() : null );
+        $qry->QDo('INSERT INTO timezones (tzid, olson_name, active, vtimezone) VALUES(:tzid,:olson_name,false,:vtimezone)', $params );
       }
       if ( !isset($tz_locn) || $tz_locn == '' ) $tz_locn = $tzid;
     }
@@ -902,11 +902,11 @@ function write_resource( DAVResource $resource, $caldav_data, DAVResource $colle
       $last_tz_locn = $tz_locn;
     }
     $params = array( ':tzid' => $tzid);
-    $qry = new AwlQuery('SELECT tz_locn FROM time_zone WHERE tz_id = :tzid', $params );
+    $qry = new AwlQuery('SELECT 1 FROM timezones WHERE tzid = :tzid', $params );
     if ( $qry->Exec('PUT',__LINE__,__FILE__) && $qry->rows() == 0 ) {
-      $params[':tzlocn'] = $tz_locn;
-      $params[':tzspec'] = (isset($tz) ? $tz->Render() : null );
-      $qry->QDo('INSERT INTO time_zone (tz_id, tz_locn, tz_spec) VALUES(:tzid,:tzlocn,:tzspec)', $params );
+      $params[':olson_name'] = $tz_locn;
+      $params[':vtimezone'] = (isset($tz) ? $tz->Render() : null );
+      $qry->QDo('INSERT INTO timezones (tzid, olson_name, active, vtimezone) VALUES(:tzid,:olson_name,false,:vtimezone)', $params );
     }
     if ( !isset($tz_locn) || $tz_locn == '' ) $tz_locn = $tzid;
 
diff --git a/testing/run_regressions.sh b/testing/run_regressions.sh
index a1be50b0..a189bdf1 100755
--- a/testing/run_regressions.sh
+++ b/testing/run_regressions.sh
@@ -120,6 +120,11 @@ initialise_regression() {
     psql -q -f "${REGRESSION}/sample-data.sql" "${DBNAME}" >"${RESULTS}/${TEST}" 2>&1
     check_result "${TEST}"
   fi
+
+  TEST="Really Upgrade Database"
+  ../dba/update-davical-database --dbname=${DBNAME} --appuser davical_app --owner davical_dba >"${RESULTS}/${TEST}" 2>&1
+  check_result "${TEST}"
+
 }
 
 
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test
index 495ea063..a7e2cacb 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test
@@ -11,11 +11,11 @@ HEAD
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name ~ '^/user3/utf8/'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.test
index 3609c4c6..618986c3 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.test
@@ -61,11 +61,11 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name ~ '^/user3/home/'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.test
index cbf54b1d..81d30b87 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.test
@@ -88,11 +88,11 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name ~ '^/user5/home/'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.test
index b4557a1e..0017b225 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.test
@@ -89,11 +89,11 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name ~ '^/User Six/home/'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection.test b/testing/tests/regression-suite/0000-Setup-PUT-collection.test
index cbbc1e0b..321df648 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection.test
@@ -165,11 +165,11 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name ~ '^/user2/home/'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/0010-Mulberry-PUT-1.test b/testing/tests/regression-suite/0010-Mulberry-PUT-1.test
index 38b5e783..45eea98d 100644
--- a/testing/tests/regression-suite/0010-Mulberry-PUT-1.test
+++ b/testing/tests/regression-suite/0010-Mulberry-PUT-1.test
@@ -42,13 +42,13 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart,
-       dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart,
+       dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       last_modified,
+       calendar_item.last_modified,
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name ~ '^/user1/home/'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test
index 2a5d791a..2a50f15a 100644
--- a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test
+++ b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test
@@ -45,14 +45,14 @@ ENDDATA
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, uid,
        dtstamp,
-       dtstart at time zone tz_locn as dtstart,
-       dtend at time zone tz_locn as dtend,
+       dtstart at time zone olson_name as dtstart,
+       dtend at time zone olson_name as dtend,
        due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       last_modified,
+       calendar_item.last_modified,
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name ~ '^/user1/home/'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/0233-Moz-PUT.test b/testing/tests/regression-suite/0233-Moz-PUT.test
index 813802a4..b85bf749 100644
--- a/testing/tests/regression-suite/0233-Moz-PUT.test
+++ b/testing/tests/regression-suite/0233-Moz-PUT.test
@@ -59,12 +59,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
-      ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+      ((current_timestamp AT TIME ZONE 'GMT' - calendar_item.last_modified) < '2 seconds'::interval) AS "~ Modified Now"
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name =
 '/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/0234-Moz-PUT.test b/testing/tests/regression-suite/0234-Moz-PUT.test
index 185b498d..9d488ece 100644
--- a/testing/tests/regression-suite/0234-Moz-PUT.test
+++ b/testing/tests/regression-suite/0234-Moz-PUT.test
@@ -57,12 +57,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due at time zone tz_locn as due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due at time zone olson_name as due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
-      ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+      ((current_timestamp AT TIME ZONE 'GMT' - calendar_item.last_modified) < '2 seconds'::interval) AS "~ Modified Now"
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name =
 '/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/0243-Moz-POST-FB.test b/testing/tests/regression-suite/0243-Moz-POST-FB.test
index 5a9da5e9..82f7b720 100644
--- a/testing/tests/regression-suite/0243-Moz-POST-FB.test
+++ b/testing/tests/regression-suite/0243-Moz-POST-FB.test
@@ -30,14 +30,14 @@ ENDDATA
 
 QUERY
 SELECT calendar_item.rrule, calendar_item.status,
-       dtstart AT TIME ZONE tz_locn AS "a)    Start",
-       tz_locn AS "b) Location",
+       dtstart AT TIME ZONE olson_name AS "a)    Start",
+       olson_name AS "b) Location",
        to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "c)UTC Start",
        to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "d)  UTC End"
  FROM usr INNER JOIN collection USING (user_no)
           INNER JOIN caldav_data USING (collection_id)
           INNER JOIN calendar_item USING(dav_id)
-          LEFT JOIN time_zone USING(tz_id)
+          LEFT JOIN timezones ON (tz_id=tzid)
 WHERE lower(usr.email) = 'user1@example.net'
   AND collection.is_calendar AND collection.schedule_transp = 'opaque'
   AND rrule_event_overlaps( dtstart, dtend, rrule, '20081020T110000Z', '20081105T110000Z' )
diff --git a/testing/tests/regression-suite/0245-Moz-POST-FB.result b/testing/tests/regression-suite/0245-Moz-POST-FB.result
index 0f3c8a54..486fd226 100644
--- a/testing/tests/regression-suite/0245-Moz-POST-FB.result
+++ b/testing/tests/regression-suite/0245-Moz-POST-FB.result
@@ -41,6 +41,6 @@ END:VCALENDAR
         c)  RRule: >FREQ=MONTHLY;INTERVAL=1;BYDAY=TU,FR<
             class: >PUBLIC<
         d)  Start: >2008-10-24 08:45:00<
+       olson_name: >Europe/Helsinki<
            status: >NULL<
-          tz_locn: >Europe/Helsinki<
 
diff --git a/testing/tests/regression-suite/0245-Moz-POST-FB.test b/testing/tests/regression-suite/0245-Moz-POST-FB.test
index a234379c..7dc107a8 100644
--- a/testing/tests/regression-suite/0245-Moz-POST-FB.test
+++ b/testing/tests/regression-suite/0245-Moz-POST-FB.test
@@ -37,12 +37,12 @@ QUERY
 SELECT calendar_item.rrule AS "c)  RRule", calendar_item.status,
    to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "a)  Start",
    to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "b) Finish",
-   calendar_item.dtstart at time zone tz_locn AS "d)  Start",
-   time_zone.tz_locn,
+   calendar_item.dtstart at time zone olson_name AS "d)  Start",
+   timezones.olson_name,
    class
  FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name,collection_id)
          INNER JOIN collection USING(collection_id)
-         LEFT JOIN time_zone USING( tz_id )
+         LEFT JOIN timezones ON (tz_id=tzid)
  WHERE caldav_data.dav_name ~ '^/user3/'
    AND rrule_event_overlaps( dtstart, dtend, rrule, '20081020T110000Z', '20081105T110000Z')
    AND caldav_data.caldav_type IN ( 'VEVENT', 'VTODO' )
diff --git a/testing/tests/regression-suite/0310-Chandler-PUT-1.test b/testing/tests/regression-suite/0310-Chandler-PUT-1.test
index 7a046b0e..d307ed3a 100644
--- a/testing/tests/regression-suite/0310-Chandler-PUT-1.test
+++ b/testing/tests/regression-suite/0310-Chandler-PUT-1.test
@@ -45,13 +45,13 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart,
-       dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart,
+       dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       last_modified,
+       calendar_item.last_modified,
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name) LEFT JOIN time_zone USING (tz_id)
+FROM caldav_data JOIN calendar_item USING(dav_name) LEFT JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name =
  '/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/0505-iCal-PUT.test b/testing/tests/regression-suite/0505-iCal-PUT.test
index b5f00ff2..e120d10d 100644
--- a/testing/tests/regression-suite/0505-iCal-PUT.test
+++ b/testing/tests/regression-suite/0505-iCal-PUT.test
@@ -59,12 +59,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
-       last_modified
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+       calendar_item.last_modified
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_etag =
 'b3e66a461ef178bd4791b2b6509bbb9d';
 ENDQUERY
diff --git a/testing/tests/regression-suite/0506-iCal-PUT.test b/testing/tests/regression-suite/0506-iCal-PUT.test
index e35001d1..0c7dad53 100644
--- a/testing/tests/regression-suite/0506-iCal-PUT.test
+++ b/testing/tests/regression-suite/0506-iCal-PUT.test
@@ -61,12 +61,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
-       last_modified
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+       calendar_item.last_modified
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_etag =
 'efd0257efbc898d059c200d1391af060';
 ENDQUERY
diff --git a/testing/tests/regression-suite/0512-iCal-PUT.test b/testing/tests/regression-suite/0512-iCal-PUT.test
index 3b41687b..44a4d6b9 100644
--- a/testing/tests/regression-suite/0512-iCal-PUT.test
+++ b/testing/tests/regression-suite/0512-iCal-PUT.test
@@ -59,11 +59,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       caldav_data AS " CalDAV Data", last_modified
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+       caldav_data AS " CalDAV Data",
+       calendar_item.last_modified
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name =
 '/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/0513-iCal-PUT.test b/testing/tests/regression-suite/0513-iCal-PUT.test
index 43c545e3..ffa1b4e7 100644
--- a/testing/tests/regression-suite/0513-iCal-PUT.test
+++ b/testing/tests/regression-suite/0513-iCal-PUT.test
@@ -64,11 +64,11 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       caldav_data AS " CalDAV Data", last_modified
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+       caldav_data AS " CalDAV Data", calendar_item.last_modified
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name =
  '/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test
index e45ca1c8..2cafaa82 100644
--- a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test
+++ b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test
@@ -48,11 +48,11 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due at time zone tz_locn as due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due at time zone olson_name as due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       caldav_data AS " CalDAV Data", last_modified
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+       caldav_data AS " CalDAV Data", calendar_item.last_modified
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name =
 '/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test
index a40fd9c1..6e2cb212 100644
--- a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test
+++ b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test
@@ -69,11 +69,11 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend,
        due, summary, location, description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       caldav_data AS " CalDAV Data", last_modified
-FROM caldav_data JOIN calendar_item USING(dav_name) LEFT JOIN time_zone USING (tz_id)
+       caldav_data AS " CalDAV Data", calendar_item.last_modified
+FROM caldav_data JOIN calendar_item USING(dav_name) LEFT JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name =
 '/resource2/home/3C1BF85D-3F28-413F-844F-80EBD33B8EE6.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/0516-iCal-POST.test b/testing/tests/regression-suite/0516-iCal-POST.test
index f67640cc..588c3ee2 100644
--- a/testing/tests/regression-suite/0516-iCal-POST.test
+++ b/testing/tests/regression-suite/0516-iCal-POST.test
@@ -34,14 +34,14 @@ REPLACE=/^DTSTAMP:\d{4}[01]\d[0123]\dT[012]\d[0-5]\d[0-6]\dZ\r?$/DTSTAMP:yyyymmd
 
 QUERY
 SELECT calendar_item.rrule, calendar_item.status,
-       dtstart AT TIME ZONE tz_locn AS "a)    Start",
-       tz_locn AS "b) Location",
+       dtstart AT TIME ZONE olson_name AS "a)    Start",
+       olson_name AS "b) Location",
        to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "c)UTC Start",
        to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "d)  UTC End"
  FROM usr INNER JOIN collection USING (user_no)
           INNER JOIN caldav_data USING (collection_id)
           INNER JOIN calendar_item USING(dav_id)
-          LEFT JOIN time_zone USING(tz_id)
+          LEFT JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name ~ '^/user2/'
   AND collection.is_calendar
   AND rrule_event_overlaps( dtstart, dtend, rrule, '20081022T054500Z', '20081024T083000Z' )
diff --git a/testing/tests/regression-suite/0701-caldav4j-PUT.test b/testing/tests/regression-suite/0701-caldav4j-PUT.test
index b319a443..b2602309 100644
--- a/testing/tests/regression-suite/0701-caldav4j-PUT.test
+++ b/testing/tests/regression-suite/0701-caldav4j-PUT.test
@@ -44,11 +44,11 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       caldav_data AS " CalDAV Data", last_modified
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+       caldav_data AS " CalDAV Data", calendar_item.last_modified
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name =
 '/user1/collection/Daily_NY_5pm.ics'
 ENDQUERY
diff --git a/testing/tests/regression-suite/0702-caldav4j-PUT.test b/testing/tests/regression-suite/0702-caldav4j-PUT.test
index 1ee290ff..a603088c 100644
--- a/testing/tests/regression-suite/0702-caldav4j-PUT.test
+++ b/testing/tests/regression-suite/0702-caldav4j-PUT.test
@@ -50,8 +50,8 @@ SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user,
        uid, dtstamp, dtstart, dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       caldav_data AS " CalDAV Data", last_modified
-FROM caldav_data LEFT JOIN calendar_item USING(dav_name) LEFT JOIN time_zone USING (tz_id)
+       caldav_data AS " CalDAV Data", calendar_item.last_modified
+FROM caldav_data LEFT JOIN calendar_item USING(dav_name) LEFT JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name =
 '/user1/collection/All_Day_NY_JAN1.ics'
 ENDQUERY
diff --git a/testing/tests/regression-suite/0804-Mulberry-PUT-1.test b/testing/tests/regression-suite/0804-Mulberry-PUT-1.test
index 90db2c92..1627c830 100644
--- a/testing/tests/regression-suite/0804-Mulberry-PUT-1.test
+++ b/testing/tests/regression-suite/0804-Mulberry-PUT-1.test
@@ -61,9 +61,9 @@ SELECT caldav_data.user_no, caldav_type, logged_user,
        uid, dtstamp, dtstart, dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now",
+       ((current_timestamp AT TIME ZONE 'GMT' - calendar_item.last_modified) < '2 seconds'::interval) AS "~ Modified Now",
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name) LEFT JOIN time_zone USING (tz_id)
+FROM caldav_data JOIN calendar_item USING(dav_name) LEFT JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name ~ '^/user1/home/i1278618276.ics'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/0817-Spec-PUT.test b/testing/tests/regression-suite/0817-Spec-PUT.test
index 8df398c0..40b7939d 100644
--- a/testing/tests/regression-suite/0817-Spec-PUT.test
+++ b/testing/tests/regression-suite/0817-Spec-PUT.test
@@ -45,13 +45,13 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart,
-       dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart,
+       dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       caldav_data AS " CalDAV Data", last_modified,
+       caldav_data AS " CalDAV Data", calendar_item.last_modified,
       dtend - dtstart AS "~Duration"
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name =
 '/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/0818-Spec-PUT.test b/testing/tests/regression-suite/0818-Spec-PUT.test
index 316e802b..ece6a165 100644
--- a/testing/tests/regression-suite/0818-Spec-PUT.test
+++ b/testing/tests/regression-suite/0818-Spec-PUT.test
@@ -46,13 +46,13 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart,
-       dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart,
+       dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       caldav_data AS " CalDAV Data", last_modified,
+       caldav_data AS " CalDAV Data", calendar_item.last_modified,
       dtend - dtstart AS "~Duration"
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name =
 '/user1/home/MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.test b/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.test
index 15de7382..a94d8149 100644
--- a/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.test
+++ b/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.test
@@ -21,14 +21,14 @@ REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/
 
 QUERY
 SELECT calendar_item.rrule, calendar_item.status,
-       dtstart AT TIME ZONE tz_locn AS "a)    Start",
-       tz_locn AS "b) Location",
+       dtstart AT TIME ZONE olson_name AS "a)    Start",
+       olson_name AS "b) Location",
        to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "c)UTC Start",
        to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "d)  UTC End"
  FROM usr INNER JOIN collection USING (user_no)
           INNER JOIN caldav_data USING (collection_id)
           INNER JOIN calendar_item USING(dav_id)
-          LEFT JOIN time_zone USING(tz_id)
+          LEFT JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name ~ '^/user1/home/'
   AND collection.is_calendar AND collection.schedule_transp = 'opaque'
   AND rrule_event_overlaps( dtstart, dtend, rrule, '20061004T140000Z', '20070105T220000Z' )
diff --git a/testing/tests/regression-suite/0835-freebusy.test b/testing/tests/regression-suite/0835-freebusy.test
index a7be47f0..3856d734 100644
--- a/testing/tests/regression-suite/0835-freebusy.test
+++ b/testing/tests/regression-suite/0835-freebusy.test
@@ -11,14 +11,14 @@ REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/
 
 QUERY
 SELECT calendar_item.rrule, calendar_item.status,
-       dtstart AT TIME ZONE tz_locn AS "a)    Start",
-       tz_locn AS "b) Location",
+       dtstart AT TIME ZONE olson_name AS "a)    Start",
+       olson_name AS "b) Location",
        to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "c)UTC Start",
        to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "d)  UTC End"
  FROM usr INNER JOIN collection USING (user_no)
           INNER JOIN caldav_data USING (collection_id)
           INNER JOIN calendar_item USING(dav_id)
-          LEFT JOIN time_zone USING(tz_id)
+          LEFT JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name ~ '^/user1/home/'
   AND collection.is_calendar AND collection.schedule_transp = 'opaque'
   AND rrule_event_overlaps( dtstart, dtend, rrule, '20061001T000000Z', '20061029T120000Z' )
diff --git a/testing/tests/regression-suite/0836-freebusy.test b/testing/tests/regression-suite/0836-freebusy.test
index b9cb6819..adf53ce8 100644
--- a/testing/tests/regression-suite/0836-freebusy.test
+++ b/testing/tests/regression-suite/0836-freebusy.test
@@ -13,14 +13,14 @@ REPLACE=/^DTEND:20070630T235959Z$/DTEND:correct/
 
 QUERY
 SELECT calendar_item.rrule, calendar_item.status,
-       dtstart AT TIME ZONE tz_locn AS "a)    Start",
-       tz_locn AS "b) Location",
+       dtstart AT TIME ZONE olson_name AS "a)    Start",
+       olson_name AS "b) Location",
        to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "c)UTC Start",
        to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "d)  UTC End"
  FROM usr INNER JOIN collection USING (user_no)
           INNER JOIN caldav_data USING (collection_id)
           INNER JOIN calendar_item USING(dav_id)
-          LEFT JOIN time_zone USING(tz_id)
+          LEFT JOIN timezones ON (tz_id=tzid)
 WHERE usr.email = 'user1@example.net'
   AND collection.is_calendar AND collection.schedule_transp = 'opaque'
   AND rrule_event_overlaps( dtstart, dtend, rrule, '20061001T000000Z', '20070630T235959Z' )
diff --git a/testing/tests/regression-suite/0837-freebusy.test b/testing/tests/regression-suite/0837-freebusy.test
index 094e0d0e..1d37a018 100644
--- a/testing/tests/regression-suite/0837-freebusy.test
+++ b/testing/tests/regression-suite/0837-freebusy.test
@@ -13,14 +13,14 @@ REPLACE=/^DTEND:20070630T235959Z$/DTEND:correct/
 
 QUERY
 SELECT calendar_item.rrule, calendar_item.status,
-       dtstart AT TIME ZONE tz_locn AS "a)    Start",
-       tz_locn AS "b) Location",
+       dtstart AT TIME ZONE olson_name AS "a)    Start",
+       olson_name AS "b) Location",
        to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "c)UTC Start",
        to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "d)  UTC End"
  FROM usr INNER JOIN collection USING (user_no)
           INNER JOIN caldav_data USING (collection_id)
           INNER JOIN calendar_item USING(dav_id)
-          LEFT JOIN time_zone USING(tz_id)
+          LEFT JOIN timezones ON (tz_id=tzid)
 WHERE usr.email = 'user1@example.net'
   AND collection.is_calendar AND collection.schedule_transp = 'opaque'
   AND rrule_event_overlaps( dtstart, dtend, rrule, '20061001T000000Z', '20070630T235959Z' )
diff --git a/testing/tests/regression-suite/0904-PUT-bad-timezone.test b/testing/tests/regression-suite/0904-PUT-bad-timezone.test
index 05c07506..45f81b53 100644
--- a/testing/tests/regression-suite/0904-PUT-bad-timezone.test
+++ b/testing/tests/regression-suite/0904-PUT-bad-timezone.test
@@ -45,11 +45,11 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone olson_name as dtstart, dtend at time zone olson_name as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
-       caldav_data AS " CalDAV Data", last_modified
-FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
+       caldav_data AS " CalDAV Data", calendar_item.last_modified
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN timezones ON (tz_id=tzid)
 WHERE caldav_data.dav_name =
 '/user1/home/PUT-eastern-time.ics'
 ENDQUERY
diff --git a/testing/tests/regression-suite/Create-Database.result b/testing/tests/regression-suite/Create-Database.result
index 0852a23a..60c0f95f 100644
--- a/testing/tests/regression-suite/Create-Database.result
+++ b/testing/tests/regression-suite/Create-Database.result
@@ -3,6 +3,14 @@
 Supported locales updated.
 Updated view: dav_principal.sql applied.
 CalDAV functions updated.
+DBD::Pg::db do failed: ERROR:  relation "timezones" does not exist at ../dba/update-davical-database line 400, <PERMS> line 48.
+DBD::Pg::db do failed: ERROR:  relation "timezones" does not exist at ../dba/update-davical-database line 410, <PERMS> line 48.
+DBD::Pg::db do failed: ERROR:  relation "tz_aliases" does not exist at ../dba/update-davical-database line 400, <PERMS> line 49.
+DBD::Pg::db do failed: ERROR:  relation "tz_aliases" does not exist at ../dba/update-davical-database line 410, <PERMS> line 49.
+DBD::Pg::db do failed: ERROR:  relation "tz_localnames" does not exist at ../dba/update-davical-database line 400, <PERMS> line 50.
+DBD::Pg::db do failed: ERROR:  relation "tz_localnames" does not exist at ../dba/update-davical-database line 410, <PERMS> line 50.
+DBD::Pg::db do failed: ERROR:  relation "timezones_our_tzno_seq" does not exist at ../dba/update-davical-database line 400, <PERMS> line 60.
+DBD::Pg::db do failed: ERROR:  relation "timezones_our_tzno_seq" does not exist at ../dba/update-davical-database line 410, <PERMS> line 60.
 RRULE functions updated.
 Database permissions updated.
 NOTE
diff --git a/testing/tests/regression-suite/Really Upgrade Database.result b/testing/tests/regression-suite/Really Upgrade Database.result
new file mode 100644
index 00000000..13952c93
--- /dev/null
+++ b/testing/tests/regression-suite/Really Upgrade Database.result	
@@ -0,0 +1,10 @@
+The database is version 8.4 currently at revision 1.2.10.
+Applying patch 1.2.11.sql ... succeeded.
+Successfully applied 1 patches.
+Supported locales updated.
+Updated view: dav_principal.sql applied.
+CalDAV functions updated.
+DBD::Pg::db do failed: ERROR:  relation "time_zone" does not exist at ../dba/update-davical-database line 400, <PERMS> line 63.
+DBD::Pg::db do failed: ERROR:  relation "time_zone" does not exist at ../dba/update-davical-database line 410, <PERMS> line 63.
+RRULE functions updated.
+Database permissions updated.
diff --git a/testing/tests/regression-suite/Upgrade-Database.result b/testing/tests/regression-suite/Upgrade-Database.result
index a34c672b..71f63f42 100644
--- a/testing/tests/regression-suite/Upgrade-Database.result
+++ b/testing/tests/regression-suite/Upgrade-Database.result
@@ -1,5 +1,13 @@
 Supported locales updated.
 Updated view: dav_principal.sql applied.
 CalDAV functions updated.
+DBD::Pg::db do failed: ERROR:  relation "timezones" does not exist at ../dba/update-davical-database line 400, <PERMS> line 48.
+DBD::Pg::db do failed: ERROR:  relation "timezones" does not exist at ../dba/update-davical-database line 410, <PERMS> line 48.
+DBD::Pg::db do failed: ERROR:  relation "tz_aliases" does not exist at ../dba/update-davical-database line 400, <PERMS> line 49.
+DBD::Pg::db do failed: ERROR:  relation "tz_aliases" does not exist at ../dba/update-davical-database line 410, <PERMS> line 49.
+DBD::Pg::db do failed: ERROR:  relation "tz_localnames" does not exist at ../dba/update-davical-database line 400, <PERMS> line 50.
+DBD::Pg::db do failed: ERROR:  relation "tz_localnames" does not exist at ../dba/update-davical-database line 410, <PERMS> line 50.
+DBD::Pg::db do failed: ERROR:  relation "timezones_our_tzno_seq" does not exist at ../dba/update-davical-database line 400, <PERMS> line 60.
+DBD::Pg::db do failed: ERROR:  relation "timezones_our_tzno_seq" does not exist at ../dba/update-davical-database line 410, <PERMS> line 60.
 RRULE functions updated.
 Database permissions updated.