diff --git a/www/kojiweb/archiveinfo.chtml b/www/kojiweb/archiveinfo.chtml
index 648a93eb..13ce2c08 100644
--- a/www/kojiweb/archiveinfo.chtml
+++ b/www/kojiweb/archiveinfo.chtml
@@ -42,7 +42,7 @@
     </tr>
     #end if
     <tr>
-      <th>Size</th><td>$archive.size</td>
+      <th>Size</th><td><span title="$util.formatThousands($archive.size)">$util.formatNatural($archive.size)</span></td>
     </tr>
     <tr>
       <th>Checksum</th><td>$archive.checksum</td>
@@ -97,7 +97,7 @@
           </tr>
           #for $file in $files
           <tr class="$util.rowToggle($self)">
-            <td><a href="fileinfo?archiveID=$archive.id&filename=$quote($file.name)">$file.name</a></td><td>$file.size</td>
+            <td><a href="fileinfo?archiveID=$archive.id&filename=$quote($file.name)">$file.name</a></td><td><span title="$util.formatThousands($file.size)">$util.formatNatural($file.size)</span></td>
           </tr>
           #end for
         </table>
diff --git a/www/kojiweb/fileinfo.chtml b/www/kojiweb/fileinfo.chtml
index 07dbe320..4631c783 100644
--- a/www/kojiweb/fileinfo.chtml
+++ b/www/kojiweb/fileinfo.chtml
@@ -19,7 +19,7 @@
     </tr>
     #end if
     <tr>
-      <th>Size</th><td>$file.size</td>
+      <th>Size</th><td><span title="$util.formatThousands($file.size)">$util.formatNatural($file.size)</span></td>
     </tr>
     #if 'mtime' in $file and $file.mtime
     <tr>
diff --git a/www/kojiweb/imageinfo.chtml b/www/kojiweb/imageinfo.chtml
index 69a9e504..d4904359 100644
--- a/www/kojiweb/imageinfo.chtml
+++ b/www/kojiweb/imageinfo.chtml
@@ -15,7 +15,7 @@
     <th>File Name</th><td>$image.filename</a></td>
   </tr>
   <tr>
-    <th>File Size</th><td>$image.filesize</td>
+    <th>File Size</th><td><span title="$util.formatThousands($image.filesize)">$util.formatNatural($image.filesize)</span></td>
   </tr>
   <tr>
     <th>Arch</th><td>$image.arch</td>
diff --git a/www/kojiweb/rpminfo.chtml b/www/kojiweb/rpminfo.chtml
index f2313f34..ea0210eb 100644
--- a/www/kojiweb/rpminfo.chtml
+++ b/www/kojiweb/rpminfo.chtml
@@ -59,7 +59,7 @@
     </tr>
     #end if
     <tr>
-      <th>Size</th><td>$util.formatThousands($rpm.size)</td>
+      <th>Size</th><td><span title="$util.formatThousands($rpm.size)">$util.formatNatural($rpm.size)</span></td>
     </tr>
     <tr>
       <th><label title="The MD5 digest of the combined header and payload contents. You can query it by `rpmkeys -Kv foo.rpm`">SIGMD5</label></th><td>$rpm.payloadhash</td>
@@ -250,7 +250,7 @@
           </tr>
           #for $file in $files
           <tr class="$util.rowToggle($self)">
-            <td><a href="fileinfo?rpmID=$rpm.id&amp;filename=$quote($file.name)">$util.escapeHTML($file.name)</a></td><td align="right">$util.formatThousands($file.size)</td>
+            <td><a href="fileinfo?rpmID=$rpm.id&amp;filename=$quote($file.name)">$util.escapeHTML($file.name)</a></td><td align="right"><span title="$util.formatThousands($file.size)">$util.formatNatural($file.size)</span></td>
           </tr>
           #end for
         </table>
diff --git a/www/lib/kojiweb/util.py b/www/lib/kojiweb/util.py
index a71797e7..b9f1f559 100644
--- a/www/lib/kojiweb/util.py
+++ b/www/lib/kojiweb/util.py
@@ -530,7 +530,16 @@ def formatMode(mode):
 
 
 def formatThousands(value):
-    return '{:,}'.format(value)
+    return '{:,} B'.format(value)
+
+
+def formatNatural(value):
+    suffix = ['B', 'KB', 'MB', 'GB']
+    suff_index = 0
+    while value >= 1024 and suff_index < 3:
+        suff_index += 1  # increment the index of the suffix
+        value = value / 1024.0  # apply the division
+    return '{:.2f} {}'.format(value, suffix[suff_index])
 
 
 def formatLink(url):