diff --git a/CREDITS b/CREDITS
index c8b9783..e81006c 100644
--- a/CREDITS
+++ b/CREDITS
@@ -18,3 +18,6 @@ Matt Sergeant <matt@sergeant.org>: Clamav plugin.
 
 Rasjid Wilcox <rasjidw@openminddev.net>: Lots of patches as per the
 Changes file.
+
+Kee Hinckley <nazgul@somewhere.com>: Sent me the correct strftime
+format for the dates in the "Received" headers.
diff --git a/Changes b/Changes
index 9bb2c64..2e61c59 100644
--- a/Changes
+++ b/Changes
@@ -1,7 +1,14 @@
 0.21-dev
 
-  All major changes in the this release where by Rasjid Wilcox
-  <rasjidw@openminddev.net>.
+  Use the proper RFC2822 date format in the Received headers. (Somehow
+  I had convinced myself that ISO8601 dates were okay). Thanks to
+  Kee Hinckley <nazgul@somewhere.com>.
+
+  Print the date in the local timezone instead of in -0000. (Not
+  entirely convinced this is a good idea)
+
+  The following major changes in the this release where by Rasjid
+  Wilcox <rasjidw@openminddev.net>.
 
   Fix error handling in queue/qmail-queue.
 
diff --git a/lib/Qpsmtpd/SMTP.pm b/lib/Qpsmtpd/SMTP.pm
index 62b93bb..1384fa3 100644
--- a/lib/Qpsmtpd/SMTP.pm
+++ b/lib/Qpsmtpd/SMTP.pm
@@ -329,7 +329,7 @@ sub data {
   $header->add("Received", "from ".$self->connection->remote_info 
 	       ." (HELO ".$self->connection->hello_host . ") (".$self->connection->remote_ip 
 	       . ") by ".$self->config('me')." (qpsmtpd/".$self->version
-	       .") with SMTP; ". (strftime('%Y-%m-%d %TZ', gmtime)),
+	       .") with SMTP; ". (strftime('%a, %d %b %Y %H:%M:%S %z', localtime)),
 	       0);
 
   # if we get here without seeing a terminator, the connection is