diff --git a/ChangeLog b/ChangeLog
index 5d124c8a3..60d9b4030 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
-Deluge 0.9.10 - "1.0.0_RC10" (In Development)
+Deluge 1.0.0 - "Sharks are bulletproof" (21 September 2008)
  Core:
   * Include GeoIP database for country look-ups
+  * Fix upgrading from 0.5.x state where torrents would have no trackers
 
 Deluge 0.9.09 - "1.0.0_RC9" (15 September 2008)
  Core:
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 8c6fa7659..57dce0fad 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -210,6 +210,13 @@ class Torrent:
         """Sets trackers"""
         if trackers == None:
             trackers = []
+            for value in self.handle.trackers():
+                tracker = {}
+                tracker["url"] = value.url
+                tracker["tier"] = value.tier
+                trackers.append(tracker)
+            self.trackers = trackers
+            return
             
         log.debug("Setting trackers for %s: %s", self.torrent_id, trackers)
         tracker_list = []