diff --git a/ChangeLog b/ChangeLog
index b156c9c76..6e30d1426 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1981043 [export] HTML in exports getting corrupted,
   thanks to Jason Judge - jasonjudge
 - bug #1936761 [interface] BINARY not treated as BLOB: update/delete issues 
+- bug #1996943 [export] Firefox 3 and .sql.gz (corrupted)
   
 2.11.6.0 (2008-04-29)
 - bug #1903724 [interface] Displaying of very large queries in error message 
diff --git a/export.php b/export.php
index fe3abb015..79fb4888f 100644
--- a/export.php
+++ b/export.php
@@ -287,7 +287,11 @@ if ($asfile) {
         // It seems necessary to check about zlib.output_compression
         // to avoid compressing twice
         if (!@ini_get('zlib.output_compression')) {
-            $content_encoding = 'x-gzip';
+            // On Firefox 3, sending this content encoding corrupts the .gz
+            // (as tested on Windows and Linux)
+            if (! (PMA_USR_BROWSER_AGENT == 'FIREFOX' && PMA_USR_BROWSER_VER >= '3.0')) {
+                $content_encoding = 'x-gzip';
+            }
             $mime_type = 'application/x-gzip';
         }
     } elseif ($compression == 'zip') {
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index a5bbb40c1..1ebb2fe67 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -178,6 +178,9 @@ class PMA_Config
                    && preg_match('@Safari/([0-9]*)@', $HTTP_USER_AGENT, $log_version2)) {
             $this->set('PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]);
             $this->set('PMA_USR_BROWSER_AGENT', 'SAFARI');
+        } elseif (preg_match('@Firefox(/| )([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) {
+             $this->set('PMA_USR_BROWSER_VER', $log_version[2]);
+             $this->set('PMA_USR_BROWSER_AGENT', 'FIREFOX');
         } elseif (preg_match('@Mozilla/([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) {
             $this->set('PMA_USR_BROWSER_VER', $log_version[1]);
             $this->set('PMA_USR_BROWSER_AGENT', 'MOZILLA');