diff --git a/src/bin/system/disks.h b/src/bin/system/disks.h
index 0d8ad19..1392ad5 100644
--- a/src/bin/system/disks.h
+++ b/src/bin/system/disks.h
@@ -5,8 +5,8 @@
 #include <Ecore.h>
 
 typedef struct _Disk_Usage {
-   unsigned long total;
-   unsigned long used;
+   unsigned long long total;
+   unsigned long long used;
 } Disk_Usage;
 
 typedef struct _File_System {
diff --git a/src/bin/system/machine.h b/src/bin/system/machine.h
index 126dcdf..c217a1d 100644
--- a/src/bin/system/machine.h
+++ b/src/bin/system/machine.h
@@ -13,15 +13,15 @@ typedef struct
 
 typedef struct
 {
-   unsigned long total;
-   unsigned long used;
-   unsigned long cached;
-   unsigned long buffered;
-   unsigned long shared;
-   unsigned long swap_total;
-   unsigned long swap_used;
+   unsigned long long total;
+   unsigned long long used;
+   unsigned long long cached;
+   unsigned long long buffered;
+   unsigned long long shared;
+   unsigned long long swap_total;
+   unsigned long long swap_used;
 
-   unsigned long zfs_arc_used;
+   unsigned long long zfs_arc_used;
 } meminfo_t;
 
 #define MAX_BATTERIES 10