diff --git a/CREDITS b/CREDITS
index 1e590de8d..f0e45a381 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,3 +1,11 @@
+=======
+CREDITS
+=======
+Version 2.0.3
+-------------
+Same as previous version.
+
+
 =======
 CREDITS
 =======
diff --git a/VERSION b/VERSION
index 8c022aa72..f7678dabc 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=2.0.2
+PRODUCT_RELEASE=2.0.3
diff --git a/install_minimal/include/airtime-constants.php b/install_minimal/include/airtime-constants.php
index b1e5720f8..28e5afb01 100644
--- a/install_minimal/include/airtime-constants.php
+++ b/install_minimal/include/airtime-constants.php
@@ -1,3 +1,3 @@
 <?php
 
-define('AIRTIME_VERSION', '2.0.2');
+define('AIRTIME_VERSION', '2.0.3');
diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php
index fa1c867e3..5b356c225 100644
--- a/install_minimal/include/airtime-upgrade.php
+++ b/install_minimal/include/airtime-upgrade.php
@@ -111,6 +111,10 @@ if (strcmp($version, "2.0.2") < 0){
     passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.0.2/airtime-upgrade.php");
     pause();
 }
+if (strcmp($version, "2.0.3") < 0){
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.0.3/airtime-upgrade.php");
+    pause();
+}
 
 //set the new version in the database.
 $sql = "DELETE FROM cc_pref WHERE keystr = 'system_version'";
diff --git a/install_minimal/upgrades/airtime-2.0.3/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.0.3/UpgradeCommon.php
new file mode 100644
index 000000000..75fe5012c
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.0.3/UpgradeCommon.php
@@ -0,0 +1,252 @@
+<?php
+
+require_once('DB.php');
+
+/* These are helper functions that are common to each upgrade such as
+ * creating connections to a database, backing up config files etc.
+ */
+class UpgradeCommon{
+    const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf";
+    const CONF_FILE_PYPO = "/etc/airtime/pypo.cfg";
+    const CONF_FILE_LIQUIDSOAP = "/etc/airtime/liquidsoap.cfg";
+    const CONF_FILE_MEDIAMONITOR = "/etc/airtime/media-monitor.cfg";
+    const CONF_FILE_API_CLIENT = "/etc/airtime/api_client.cfg";
+
+    const CONF_PYPO_GRP = "pypo";
+    const CONF_WWW_DATA_GRP = "www-data";
+    const CONF_BACKUP_SUFFIX = "202";
+    const VERSION_NUMBER = "2.0.2";
+    
+    public static function SetDefaultTimezone()
+    {       
+        $sql = "SELECT valstr from cc_pref WHERE keystr = 'timezone'";
+
+        $result = self::queryDb($sql);
+        $timezone = $result['valstr'];
+                
+        date_default_timezone_set($timezone);
+    }
+    
+    public static function connectToDatabase($p_exitOnError = true)
+    {
+        global $CC_DBC, $CC_CONFIG;
+        $CC_DBC = DB::connect($CC_CONFIG['dsn'], FALSE);
+        if (PEAR::isError($CC_DBC)) {
+            echo $CC_DBC->getMessage().PHP_EOL;
+            echo $CC_DBC->getUserInfo().PHP_EOL;
+            echo "Database connection problem.".PHP_EOL;
+            echo "Check if database '{$CC_CONFIG['dsn']['database']}' exists".
+                 " with corresponding permissions.".PHP_EOL;
+            if ($p_exitOnError) {
+                exit(1);
+            }
+        } else {
+            $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
+        }
+    }
+
+    
+    public static function DbTableExists($p_name)
+    {
+        global $CC_DBC;
+        $sql = "SELECT * FROM ".$p_name;
+        $result = $CC_DBC->GetOne($sql);
+        if (PEAR::isError($result)) {
+            return false;
+        }
+        return true;
+    }
+
+    private static function GetAirtimeSrcDir()
+    {
+        return __DIR__."/../../../airtime_mvc";
+    }
+
+    public static function MigrateTablesToVersion($dir, $version)
+    {
+        echo "Upgrading database, may take several minutes, please wait".PHP_EOL;
+        
+        $appDir = self::GetAirtimeSrcDir();
+        $command = "php --php-ini $dir/../../airtime-php.ini ".
+                    "$appDir/library/doctrine/migrations/doctrine-migrations.phar ".
+                    "--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
+                    "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ".
+                    "--no-interaction migrations:migrate $version";
+        system($command);
+    }
+
+    public static function BypassMigrations($dir, $version)
+    {
+        $appDir = self::GetAirtimeSrcDir();
+        $command = "php --php-ini $dir/../../airtime-php.ini ".
+                    "$appDir/library/doctrine/migrations/doctrine-migrations.phar ".
+                    "--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
+                    "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ".
+                    "--no-interaction --add migrations:version $version";
+        system($command);
+    }
+
+    public static function upgradeConfigFiles(){
+
+        $configFiles = array(UpgradeCommon::CONF_FILE_AIRTIME,
+                             UpgradeCommon::CONF_FILE_PYPO,
+                             UpgradeCommon::CONF_FILE_LIQUIDSOAP,
+                             UpgradeCommon::CONF_FILE_MEDIAMONITOR,
+                             UpgradeCommon::CONF_FILE_API_CLIENT);
+
+        // Backup the config files
+        $suffix = date("Ymdhis")."-".UpgradeCommon::VERSION_NUMBER;
+        foreach ($configFiles as $conf) {
+            // do not back up monit cfg
+            if (file_exists($conf)) {
+                echo "Backing up $conf to $conf$suffix.bak".PHP_EOL;
+                //copy($conf, $conf.$suffix.".bak");
+                exec("cp -p $conf $conf$suffix.bak"); //use cli version to preserve file attributes
+            }
+        }
+
+        self::CreateIniFiles(UpgradeCommon::CONF_BACKUP_SUFFIX);
+        self::MergeConfigFiles($configFiles, $suffix);
+    }
+
+    /**
+     * This function creates the /etc/airtime configuration folder
+     * and copies the default config files to it.
+     */
+    public static function CreateIniFiles($suffix)
+    {
+        if (!file_exists("/etc/airtime/")){
+            if (!mkdir("/etc/airtime/", 0755, true)){
+                echo "Could not create /etc/airtime/ directory. Exiting.";
+                exit(1);
+            }
+        }
+
+        if (!copy(__DIR__."/airtime.conf.$suffix", self::CONF_FILE_AIRTIME)){
+            echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
+            exit(1);
+        }
+        if (!copy(__DIR__."/pypo.cfg.$suffix", self::CONF_FILE_PYPO)){
+            echo "Could not copy pypo.cfg to /etc/airtime/. Exiting.";
+            exit(1);
+        }
+        if (!copy(__DIR__."/media-monitor.cfg.$suffix", self::CONF_FILE_MEDIAMONITOR)){
+            echo "Could not copy meadia-monitor.cfg to /etc/airtime/. Exiting.";
+            exit(1);
+        }
+        if (!copy(__DIR__."/api_client.cfg.$suffix", self::CONF_FILE_API_CLIENT)){
+            echo "Could not copy api_client.cfg to /etc/monit/conf.d/. Exiting.";
+            exit(1);
+        }
+    }
+
+    private static function MergeConfigFiles($configFiles, $suffix) {
+        foreach ($configFiles as $conf) {
+            // we want to use new liquidsoap.cfg so don't merge
+            // also for monit
+            if( $conf == self::CONF_FILE_LIQUIDSOAP){
+                continue;
+            }
+            if (file_exists("$conf$suffix.bak")) {
+
+                if($conf === self::CONF_FILE_AIRTIME) {
+                    // Parse with sections
+                    $newSettings = parse_ini_file($conf, true);
+                    $oldSettings = parse_ini_file("$conf$suffix.bak", true);
+                }
+                else {
+                    $newSettings = self::ReadPythonConfig($conf);
+                    $oldSettings = self::ReadPythonConfig("$conf$suffix.bak");
+                }
+
+                $settings = array_keys($newSettings);
+
+                foreach($settings as $section) {
+                    if(isset($oldSettings[$section])) {
+                        if(is_array($oldSettings[$section])) {
+                            $sectionKeys = array_keys($newSettings[$section]);
+                            foreach($sectionKeys as $sectionKey) {
+                                // skip airtim_dir as we want to use new value
+                                if($sectionKey != "airtime_dir"){
+                                    if(isset($oldSettings[$section][$sectionKey])) {
+                                        self::UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]);
+                                    }
+                                }
+                            }
+                        }
+                        else {
+                            self::UpdateIniValue($conf, $section, $oldSettings[$section]);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private static function ReadPythonConfig($p_filename)
+    {
+        $values = array();
+        
+        $fh = fopen($p_filename, 'r');
+        
+        while(!feof($fh)){
+            $line = fgets($fh);
+            if(substr(trim($line), 0, 1) == '#' || trim($line) == ""){
+                continue;
+            }else{
+                $info = explode('=', $line, 2);
+                $values[trim($info[0])] = trim($info[1]);
+            }
+        }
+
+        return $values;
+    }
+
+    /**
+     * This function updates an INI style config file.
+     *
+     * A property and the value the property should be changed to are
+     * supplied. If the property is not found, then no changes are made.
+     *
+     * @param string $p_filename
+     *      The path the to the file.
+     * @param string $p_property
+     *      The property to look for in order to change its value.
+     * @param string $p_value
+     *      The value the property should be changed to.
+     *
+     */
+    private static function UpdateIniValue($p_filename, $p_property, $p_value)
+    {
+        $lines = file($p_filename);
+        $n=count($lines);
+        foreach ($lines as &$line) {
+            if ($line[0] != "#"){
+                $key_value = explode("=", $line);
+                $key = trim($key_value[0]);
+
+                if ($key == $p_property){
+                    $line = "$p_property = $p_value".PHP_EOL;
+                }
+            }
+        }
+
+        $fp=fopen($p_filename, 'w');
+        for($i=0; $i<$n; $i++){
+            fwrite($fp, $lines[$i]);
+        }
+        fclose($fp);
+    }
+    
+    public static function queryDb($p_sql){
+        global $CC_DBC;
+
+        $result = $CC_DBC->getRow($p_sql, $fetchmode=DB_FETCHMODE_ASSOC);
+        if (PEAR::isError($result)) {
+            echo "Error executing $sql. Exiting.";
+            exit(1);
+        }
+        
+        return $result;
+    }
+}
diff --git a/install_minimal/upgrades/airtime-2.0.3/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.3/airtime-upgrade.php
new file mode 100644
index 000000000..e10b110a2
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.0.3/airtime-upgrade.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package Airtime
+ * @subpackage StorageServer
+ * @copyright 2010 Sourcefabric O.P.S.
+ * @license http://www.gnu.org/licenses/gpl.txt
+ */
+ 
+/*
+ * In the future, most Airtime upgrades will involve just mutating the
+ * data that is stored on the system. For example, The only data
+ * we need to preserve between versions is the database, /etc/airtime, and
+ * /srv/airtime. Everything else is just binary files that can be removed/replaced
+ * with the new version of Airtime. Of course, the data may need to be in a new
+ * format, and that's what this upgrade script will be for.
+ */
+
+set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
+set_include_path(__DIR__.'/../../../airtime_mvc/application/models' . PATH_SEPARATOR . get_include_path());
+set_include_path(__DIR__.'/../../../airtime_mvc/application/configs' . PATH_SEPARATOR . get_include_path());
+require_once 'conf.php';
+require_once 'propel/runtime/lib/Propel.php';
+Propel::init(__DIR__."/propel/airtime-conf.php");
+
+require_once 'UpgradeCommon.php';
+
+class AirtimeStorWatchedDirsUpgrade{
+
+    public static function start(){
+    }
+}
+
+/* This class deals with any modifications to config files in /etc/airtime
+ * as well as backups. All functions other than start() should be marked
+ * as private. */
+class AirtimeConfigFileUpgrade{
+
+    public static function start(){
+        echo "* Updating configFiles\n";
+        UpgradeCommon::upgradeConfigFiles();
+    }
+}
+
+/* This class deals with any modifications to config files in /etc/airtime
+ * as well as backups. All functions other than start() should be marked
+ * as private. */
+class AirtimeMiscUpgrade{
+
+    public static function start(){
+        echo "* Modifying User Pypo".PHP_EOL;
+        exec("usermod -s /bin/false pypo");
+        exec("passwd --delete pypo");
+    }
+}
+
+
+UpgradeCommon::connectToDatabase();
+UpgradeCommon::SetDefaultTimezone();
+AirtimeConfigFileUpgrade::start();
+AirtimeMiscUpgrade::start();
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index 5a054a060..3c303d9bc 100755
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -21,7 +21,7 @@ from urlparse import urlparse
 import base64
 from configobj import ConfigObj
 
-AIRTIME_VERSION = "2.0.2"
+AIRTIME_VERSION = "2.0.3"
 
 def api_client_factory(config, logger=None):
     if logger != None: