diff --git a/ChangeLog b/ChangeLog
index 6ac9f8120..0b8782eec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ Deluge 1.0.3 (In Development)
   * Fix upnp - it should work on more routers now too
   * Fix issue where Deluge would send improper stats to the tracker after a
     pause/resume.
+  * Fix issue where fastresume files would be rejected when using FAT32.  This
+    would cause the torrent to be rechecked on every startup.
 
 Deluge 1.0.2 (10 October 2008)
  Core:
diff --git a/libtorrent/src/storage.cpp b/libtorrent/src/storage.cpp
index c21f68fbb..d87fc2500 100755
--- a/libtorrent/src/storage.cpp
+++ b/libtorrent/src/storage.cpp
@@ -396,8 +396,11 @@ namespace libtorrent
 					+ " bytes";
 				return false;
 			}
-			if ((compact_mode && time != s->second)
-				|| (!compact_mode && time < s->second))
+			// allow one second 'slack', because of FAT volumes
+			// in sparse mode, allow the files to be more recent
+			// than the resume data, but only by 5 minutes
+			if ((compact_mode && (time > s->second + 1 || time < s->second - 1)) ||
+				(!compact_mode && (time > s->second + 5 * 60) || time < s->second - 1))
 			{
 				if (error) *error = "timestamp mismatch for file '"
 					+ i->path.native_file_string()