diff --git a/ChangeLog b/ChangeLog
index cd3290758..89d14b596 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,10 +5,13 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-02-08 Michal Čihař  <michal@cihar.com>
+    * export.php: Fix export of SQL for Safari (bug #1113015).
+
 2005-02-07 Marc Delisle  <lem9@users.sourceforge.net>
-    * libraries/dbi/*: bug #1116933, PMA_DBI_free_result(): 
+    * libraries/dbi/*: bug #1116933, PMA_DBI_free_result():
       do not send a boolean to mysqli_free_result() or mysql_free_result(),
-      it expects a result resource 
+      it expects a result resource
     * libraries/tbl_move_copy.php: bug #1117112, commands out of sync when
       using "copy table" operation
     * libraries/common.lib.php: bug #1114363, error when SHOW DATABASES is
@@ -34,8 +37,8 @@ $Source$
 
 2005-02-02 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/dbi/*: PMA_DBI_num_rows(): do not send a boolean
-      to mysqli_num_rows() or mysql_num_row(), it expects a result resource 
-    * tbl_properties.inc.php: bug #1114550, changing the type of 
+      to mysqli_num_rows() or mysql_num_row(), it expects a result resource
+    * tbl_properties.inc.php: bug #1114550, changing the type of
       a float unsigned column
 
 2005-01-30 Marc Delisle  <lem9@users.sourceforge.net>
diff --git a/export.php b/export.php
index 1c9444eb7..39e1e858d 100644
--- a/export.php
+++ b/export.php
@@ -230,7 +230,12 @@ if ($asfile) {
         $mime_type = 'application/x-tex';
     } else {
         $filename  .= '.sql';
-        $mime_type = 'text/x-sql';
+        // text/x-sql is correct MIME type, however safari ignores further
+        // Content-Disposition header, so we must force it to download it this
+        // way...
+        $mime_type = PMA_USR_BROWSER_AGENT == 'SAFARI'
+                        ? 'application/octet-stream'
+                        : 'text/x-sql';
     }
 
     // If dump is going to be compressed, set correct encoding or mime_type and add