diff --git a/library/system/setup b/library/system/setup
index 58e0332d8de..0315a351dad 100644
--- a/library/system/setup
+++ b/library/system/setup
@@ -539,7 +539,16 @@ class LinuxHardware(Hardware):
         for line in mtab.split('\n'):
             if line.startswith('/'):
                 fields = line.rstrip('\n').split()
-                self.facts['mounts'].append({'mount': fields[1], 'device':fields[0], 'fstype': fields[2], 'options': fields[3]})
+                statvfs_result = os.statvfs(fields[1])
+                self.facts['mounts'].append(
+                    {'mount': fields[1],
+                     'device':fields[0],
+                     'fstype': fields[2],
+                     'options': fields[3],
+                     # statvfs data
+                     'size_total': statvfs_result.f_bsize * statvfs_result.f_blocks,
+                     'size_available': statvfs_result.f_bsize * (statvfs_result.f_bavail),
+                     })
 
     def get_device_facts(self):
         self.facts['devices'] = {}