diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index f0326ef85..55508143c 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -297,8 +297,10 @@ class AirtimeInstall
     public static function SetDefaultTimezone()
     {
         global $CC_DBC;
+        
+        $defaultTimezone = date_default_timezone_get();
 
-        $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('timezone', 'America/Toronto')";
+        $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('timezone', '$defaultTimezone')";
         $result = $CC_DBC->query($sql);
         if (PEAR::isError($result)) {
             return false;
diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
index 6c9bdce85..9970f3078 100644
--- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
@@ -20,8 +20,10 @@ class AirtimeInstall{
     public static function SetDefaultTimezone()
     {
         global $CC_DBC;
+        
+        $defaultTimezone = date_default_timezone_get();
 
-        $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('timezone', 'America/Toronto')";
+        $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('timezone', '$defaultTimezone')";
         $result = $CC_DBC->query($sql);
         if (PEAR::isError($result)) {
             return false;