diff --git a/CREDITS b/CREDITS
index 826799c99..b52ae289e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,7 +2,7 @@
 CREDITS
 =======
 
-Version 2.5.1
+Version 2.5.3
 
 Albert Santoni (albert.santoni@sourcefabric.org)
   Role: Developer Team Lead
diff --git a/VERSION b/VERSION
index 5a1ef0b72..b7fd8620d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=2.5.0
+PRODUCT_RELEASE=2.5.3
diff --git a/install_minimal/include/airtime-constants.php b/install_minimal/include/airtime-constants.php
index 2a3bf95ee..fd6240bd2 100644
--- a/install_minimal/include/airtime-constants.php
+++ b/install_minimal/include/airtime-constants.php
@@ -1,3 +1,3 @@
 <?php
 
-define('AIRTIME_VERSION', '2.5.1');
+define('AIRTIME_VERSION', '2.5.3');
diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php
index a85fbeed0..af9f971d4 100644
--- a/install_minimal/include/airtime-upgrade.php
+++ b/install_minimal/include/airtime-upgrade.php
@@ -102,4 +102,8 @@ if (strcmp($version, "2.5.1") < 0) {
     passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.5.1/airtime-upgrade.php");
     pause();
 }
+if (strcmp($version, "2.5.3") < 0) {
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.5.3/airtime-upgrade.php");
+    pause();
+}
 echo "******************************* Upgrade Complete *******************************".PHP_EOL;
diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
new file mode 100644
index 000000000..8574d4bee
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -0,0 +1,48 @@
+<?php
+
+// Define path to application directory
+defined('APPLICATION_PATH')
+    || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../../../install_minimal/../airtime_mvc/application'));
+
+// Ensure library/ is on include_path
+set_include_path(implode(PATH_SEPARATOR, array(
+    get_include_path(),
+    realpath(APPLICATION_PATH . '/../library')
+)));
+
+/*set_include_path(implode(PATH_SEPARATOR, array(
+    get_include_path(),
+    realpath(APPLICATION_PATH . '/../library/propel/runtime/lib')
+)));*/
+
+//Propel classes.
+set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_path());
+set_include_path(APPLICATION_PATH . '/models/airtime' . PATH_SEPARATOR . get_include_path());
+set_include_path(APPLICATION_PATH . '/models/om' . PATH_SEPARATOR . get_include_path());
+
+require_once 'propel/runtime/lib/Propel.php';
+require_once 'CcMusicDirsQuery.php';
+#require_once 'BaseCcMusicDirsQuery.php';
+
+class StorageQuotaUpgrade
+{
+    public static function startUpgrade()
+    {
+        echo "* Updating storage usage for new quota tracking".PHP_EOL;
+        self::setStorageUsage();
+    }
+
+    private static function setStorageUsage()
+    {
+        $musicDir = CcMusicDirsQuery::create()
+            ->filterByDbType('stor')
+            ->filterByDbExists(true)
+            ->findOne();
+        $storPath = $musicDir->getDbDirectory();
+
+        $freeSpace = disk_free_space($storPath);
+        $totalSpace = disk_total_space($storPath);
+
+        Application_Model_Preference::setDiskUsage($totalSpace - $freeSpace);
+    }
+}
diff --git a/install_minimal/upgrades/airtime-2.5.3/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.5.3/airtime-upgrade.php
index 042b92d05..31792eb7a 100644
--- a/install_minimal/upgrades/airtime-2.5.3/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/airtime-upgrade.php
@@ -1,8 +1,10 @@
 <?php
 
 require_once 'DbUpgrade.php';
+require_once 'StorageQuotaUpgrade.php';
 
 $filename = "/etc/airtime/airtime.conf";
 $values = parse_ini_file($filename, true);
 
 AirtimeDatabaseUpgrade::start($values);
+StorageQuotaUpgrade::startUpgrade();