diff --git a/includes/common.inc b/includes/common.inc
index 075a840..26c5c0d 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1253,8 +1253,12 @@ function format_size($size, $langcode = NULL) {
     if ($size >= 1024) {
       $size = round($size / 1024, 2);
       $suffix = t('MB', array(), $langcode);
+      if ($size >= 1024) {
+        $size = round($size / 1024, 2);
+        $suffix = t('GB', array(), $langcode);
+      }
     }
-    return t('@size @suffix', array('@size' => $size, '@suffix' => $suffix), $langcode);
+    return t('@size @suffix', array('@size' => number_format($size, 2), '@suffix' => $suffix), $langcode);
   }
 }