diff --git a/ChangeLog b/ChangeLog
index 3e55a0ad4..77c6430ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug [history] Do not save too big queries in history 
 - [security] Do not show version info on login screen 
 - bug #2018595 [import] Potential data loss on import resubmit 
+- patch #2020630 [export] Safari and timedate, thanks to Sebastian Mendel,
+  Isaac Bennetch and Jürgen Wind 
 
 2.11.7.1 (2008-07-15)
 - bug [security] XSRF/CSRF by manipulating the db,
diff --git a/export.php b/export.php
index c851aced7..bdfb34275 100644
--- a/export.php
+++ b/export.php
@@ -363,6 +363,11 @@ if (!$save_on_server) {
             header('Pragma: public');
         } else {
             header('Pragma: no-cache');
+            // test case: exporting a database into a .gz file with Safari
+            // would produce files not having the current time 
+            if ('SAFARI' == PMA_USR_BROWSER_AGENT) {
+                header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+            } 
         }
     } else {
         // HTML