diff --git a/ChangeLog b/ChangeLog
index 1983f3222..18a7b26d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ Deluge 0.9.07 - "1.0.0_RC7" (In Development)
   * Improve performance of initial torrent list load
   * Fix hiding the bottom pane when disabling all the tabs
   * Fix not showing new torrents if you don't use the All label first
+  * Fix size units to be more accurate
  
  Windows:
   * Fix Vista slowness issue
diff --git a/deluge/common.py b/deluge/common.py
index 0775797e0..80c369428 100644
--- a/deluge/common.py
+++ b/deluge/common.py
@@ -262,13 +262,13 @@ def show_other_dialog(string, default=None):
 def fsize(fsize_b):
     """Returns formatted string describing filesize
        fsize_b should be in bytes
-       Returned value will be in either KB, MB, or GB
-    """    
+       Returned value will be in either KiB, MiB, or GiB
+    """
     fsize_kb = fsize_b / 1024.0
-    if fsize_kb < 1000:
+    if fsize_kb < 1024:
         return "%.1f KiB" % fsize_kb
     fsize_mb = fsize_kb / 1024.0
-    if fsize_mb < 1000:
+    if fsize_mb < 1024:
         return "%.1f MiB" % fsize_mb
     fsize_gb = fsize_mb / 1024.0
     return "%.1f GiB" % fsize_gb