diff --git a/Changelog b/Changelog
index 03e8f0e7b..163f5b4a6 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.1.2
     - BUGFIX: Fix overwrite check when renaming a folder in a torrent
     - BUGFIX: Force a recheck after renaming files to avoid overwriting
+    - COSMETIC: Improved transfer speed display in peers list
 
 * Wed Jan 20 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.1
     - BUGFIX: Fix compilation with Qt4.4
diff --git a/src/peerlistdelegate.h b/src/peerlistdelegate.h
index 7408a6de4..92ba1886e 100644
--- a/src/peerlistdelegate.h
+++ b/src/peerlistdelegate.h
@@ -56,7 +56,8 @@ public:
         case UP_SPEED:{
             QItemDelegate::drawBackground(painter, opt, index);
             double speed = index.data().toDouble();
-            QItemDelegate::drawDisplay(painter, opt, opt.rect, QString::number(speed/1024., 'f', 1)+" "+tr("KiB/s"));
+            if (speed > 0.0)
+              QItemDelegate::drawDisplay(painter, opt, opt.rect, misc::friendlyUnit(speed)+tr("/s", "/second (i.e. per second)"));
             break;
           }
         case PROGRESS:{