diff --git a/include/modules/disk.hpp b/include/modules/disk.hpp
index 2a307c9e..1b4f3176 100644
--- a/include/modules/disk.hpp
+++ b/include/modules/disk.hpp
@@ -20,6 +20,9 @@ class Disk : public ALabel {
  private:
   util::SleeperThread thread_;
   std::string path_;
+  std::string unit_;
+
+  float calc_specific_divisor(const std::string divisor);
 };
 
 }  // namespace waybar::modules
diff --git a/src/modules/disk.cpp b/src/modules/disk.cpp
index eb4d902f..ae1e5cf5 100644
--- a/src/modules/disk.cpp
+++ b/src/modules/disk.cpp
@@ -11,6 +11,9 @@ waybar::modules::Disk::Disk(const std::string& id, const Json::Value& config)
   if (config["path"].isString()) {
     path_ = config["path"].asString();
   }
+  if (config["unit"].isString()) {
+    unit_ = config["unit"].asString();
+  }
 }
 
 auto waybar::modules::Disk::update() -> void {
@@ -43,6 +46,13 @@ auto waybar::modules::Disk::update() -> void {
     return;
   }
 
+  float specific_free, specific_used, specific_total, divisor;
+
+  divisor = calc_specific_divisor(unit_);
+  specific_free = (stats.f_bavail * stats.f_frsize)/divisor;
+  specific_used = ((stats.f_blocks - stats.f_bfree) * stats.f_frsize)/divisor;
+  specific_total = (stats.f_blocks * stats.f_frsize)/divisor;
+
   auto free = pow_format(stats.f_bavail * stats.f_frsize, "B", true);
   auto used = pow_format((stats.f_blocks - stats.f_bfree) * stats.f_frsize, "B", true);
   auto total = pow_format(stats.f_blocks * stats.f_frsize, "B", true);
@@ -62,7 +72,8 @@ auto waybar::modules::Disk::update() -> void {
         fmt::runtime(format), stats.f_bavail * 100 / stats.f_blocks, fmt::arg("free", free),
         fmt::arg("percentage_free", stats.f_bavail * 100 / stats.f_blocks), fmt::arg("used", used),
         fmt::arg("percentage_used", percentage_used), fmt::arg("total", total),
-        fmt::arg("path", path_)));
+        fmt::arg("path", path_), fmt::arg("specific_free", specific_free), 
+        fmt::arg("specific_used", specific_used), fmt::arg("specific_total", specific_total)));
   }
 
   if (tooltipEnabled()) {
@@ -74,8 +85,31 @@ auto waybar::modules::Disk::update() -> void {
         fmt::runtime(tooltip_format), stats.f_bavail * 100 / stats.f_blocks, fmt::arg("free", free),
         fmt::arg("percentage_free", stats.f_bavail * 100 / stats.f_blocks), fmt::arg("used", used),
         fmt::arg("percentage_used", percentage_used), fmt::arg("total", total),
-        fmt::arg("path", path_)));
+        fmt::arg("path", path_), fmt::arg("specific_free", specific_free), 
+        fmt::arg("specific_used", specific_used), fmt::arg("specific_total", specific_total)));
   }
   // Call parent update
   ALabel::update();
 }
+
+float waybar::modules::Disk::calc_specific_divisor(std::string divisor) {
+  if (divisor == "kB") {
+    return 1000.0;
+  } else if (divisor == "kiB") {
+    return 1024.0;
+  } else if (divisor == "MB") {
+    return 1000.0 * 1000.0;
+  } else if (divisor == "MiB") {
+    return 1024.0 * 1024.0;
+  } else if (divisor == "GB") {
+    return 1000.0 * 1000.0 * 1000.0;
+  } else if (divisor == "GiB") {
+    return 1024.0 * 1024.0 * 1024.0;
+  } else if (divisor == "TB") {
+    return 1000.0 * 1000.0 * 1000.0 * 1000.0;
+  } else if (divisor == "TiB") {
+    return 1024.0 * 1024.0 * 1024.0 * 1024.0;
+  } else { //default to Bytes if it is anything that we don't recongnise
+    return 1.0;
+  }
+}
\ No newline at end of file