diff --git a/CHANGES b/CHANGES
index f24eb3dd1ecf59451d4fb45ae0dfa0a786d410f8..2901c09f8c95764c0f34a4a3ecbc49eead6100f3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel Stenberg (4 Nov 2008)
+- CURLINFO_FILETIME now works for file:// transfers as well
+
 Daniel Stenberg (3 Nov 2008)
 - Bug #2218480 (http://curl.haxx.se/bug/view.cgi?id=2218480) pointed out a
   problem with my CURLINFO_PRIMARY_IP fix from October 7th that caused a NULL
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index eba0012f645cd55e417b78e8b9199d747dc31cdc..896f0e6c9b78aa9c9920de7a34b77ba8e7d2cda9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -42,7 +42,8 @@ This release includes the following bugfixes:
  o Solaris builds get _REENTRANT defined properly and work again
  o Garbage sent on chunky upload after curl_easy_pause()
  o ipv4 name resolves when libcurl is built with ipv6-enabled c-ares
- o undersized IPv6 address internal buffer truncates long IPv6 addresses
+ o undersized IPv6 address internal buffer truncated long IPv6 addresses
+ o CURLINFO_FILETIME works for file:// transfers as well
 
 This release includes the following known bugs:
 
diff --git a/lib/file.c b/lib/file.c
index de5d52b32be4e3c9cec3b2370efbe06ca7563b62..b0af2fcd90838939be82869b6fb5707338ce0c04 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -451,6 +451,8 @@ static CURLcode file_do(struct connectdata *conn, bool *done)
   if( -1 != fstat(fd, &statbuf)) {
     /* we could stat it, then read out the size */
     expected_size = statbuf.st_size;
+    /* and store the modification time */
+    data->info.filetime = (long)statbuf.st_mtime;
     fstated = TRUE;
   }