diff --git a/airtime_mvc/application/models/Systemstatus.php b/airtime_mvc/application/models/Systemstatus.php
index b97ea491e..dcb5c1dac 100644
--- a/airtime_mvc/application/models/Systemstatus.php
+++ b/airtime_mvc/application/models/Systemstatus.php
@@ -214,27 +214,20 @@ class Application_Model_Systemstatus
     public static function GetDiskInfo()
     {
         $partitions = array();
-
-        //connect to DB and find how much total space user has allocated.
-        $totalSpace = Application_Model_Preference::GetDiskQuota();
-
-        $usedSpace = Application_Model_Preference::getDiskUsage();
-        if (empty($usedSpace)) {
-            $usedSpace = 0;
+        /* First lets get all the watched directories. Then we can group them
+        * into the same partitions by comparing the partition sizes. */
+        $musicDirs = Application_Model_MusicDir::getWatchedDirs();
+        $musicDirs[] = Application_Model_MusicDir::getStorDir();
+        foreach ($musicDirs as $md) {
+            $totalSpace = disk_total_space($md->getDirectory());
+            if (!isset($partitions[$totalSpace])) {
+                $partitions[$totalSpace] = new StdClass;
+                $partitions[$totalSpace]->totalSpace = $totalSpace;
+                $partitions[$totalSpace]->totalFreeSpace = disk_free_space($md->getDirectory());
+                $partitions[$totalSpace]->usedSpace = $totalSpace - $partitions[$totalSpace]->totalFreeSpace;
+            }
+            $partitions[$totalSpace]->dirs[] = $md->getDirectory();
         }
-        /* $path = $_SERVER['AIRTIME_BASE']."etc/airtime/num_bytes.ini";
-        $arr = parse_ini_file($path);
-
-        $usedSpace = 0;
-        if ($arr !== false) {
-            $usedSpace = $arr['num_bytes'];
-        } */
-        
-        $partitions[$totalSpace] = new stdClass();
-        $partitions[$totalSpace]->totalSpace = $totalSpace;
-        $partitions[$totalSpace]->totalFreeSpace = $totalSpace - $usedSpace;
-        //Logging::info($partitions[$totalSpace]->totalFreeSpace);
-
         return array_values($partitions);
     }
 
diff --git a/airtime_mvc/application/views/scripts/systemstatus/index.phtml b/airtime_mvc/application/views/scripts/systemstatus/index.phtml
index 1958f404b..9fa27d378 100644
--- a/airtime_mvc/application/views/scripts/systemstatus/index.phtml
+++ b/airtime_mvc/application/views/scripts/systemstatus/index.phtml
@@ -17,12 +17,6 @@
     $r1 = array_reduce($phpDependencies, "booleanReduce", true);
     $r2 = array_reduce($externalServices, "booleanReduce", true);
     $result = $r1 && $r2;
-
-    // Disk information. We only use the [0]th index
-    // because we don't have Watched/Media Folders
-    $disk = $this->status->partitions[0];
-    $used = $disk->totalSpace-$disk->totalFreeSpace;
-    $total = $disk->totalSpace;
 ?>
 
 <table width="60%" cellpadding="0" cellspacing="0" border="0" class="statustable">
@@ -159,22 +153,4 @@
     <tr id="partitions" class="even">
         <th colspan="5"><?php echo _("Disk Space") ?></th>
     </tr>
-    <tr class="partition-info">
-        <td><span class="strong"><?php echo _("Disk") ?></span>
-            <ul id="watched-dir-list">
-            </ul>
-        </td>
-        <td>
-            <?php
-                echo sprintf("%01.1fGB of %01.1fGB", $used/pow(2, 30), $total/pow(2, 30))
-            ?>
-        </td>
-        <td colspan="3">
-            <div class="big">
-                <div class="diskspace" style="width:<?php echo sprintf("%01.1f%%", $used/$total*100) ?>;">
-                </div>
-            </div>
-            <div><?php echo sprintf("%01.1f%% ", $used/$total*100) .  _("in use") ?></div>
-        </td>
-    </tr>
 </table>
diff --git a/docs/manual/status/static/Screenshot521-System_status_240.png b/docs/manual/status/static/Screenshot521-System_status_240.png
index 1cfbbbf7c..bebbaf802 100644
Binary files a/docs/manual/status/static/Screenshot521-System_status_240.png and b/docs/manual/status/static/Screenshot521-System_status_240.png differ