diff --git a/ChangeLog b/ChangeLog
index c0668018d..b3d3a5c4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Deluge 1.1.0_RC3 (05 January 2009)
  Core:
   * Fix applying proxy settings
+  * Fix the display of the tracker host when it's an IP address and not a hostname
 
  GtkUI:
   * Fix folder renaming to display the change properly
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 43072722d..8d2d219ec 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -519,6 +519,16 @@ class Torrent:
             url = urlparse(tracker)
             if hasattr(url, "hostname"):
                 host = (url.hostname or 'DHT')
+                # Check if hostname is an IP address and just return it if that's the case
+                import socket
+                try:
+                    socket.inet_aton(url.hostname)
+                except socket.error:
+                    pass
+                else:
+                    # This is an IP address because an exception wasn't raised
+                    return url.hostname
+
                 parts = host.split(".")
                 if len(parts) > 2:
                     if parts[-2] in ("co", "com"):