diff --git a/ChangeLog b/ChangeLog
index 7c9f906ed..bba2f3c46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1821264 [display] MaxTableList and INFORMATION_SCHEMA 
 - bug #1859460 [display] Operations and many databases
 - bug #1814679 [display] Database selection pagination when switching servers
+- patch #1861717 [export] CSV Escape character not exported right,
+  thanks to nicolasdigraf
 
 2.11.3.0 (2007-12-08)
 - patch #1818389 to remove a notice (failed to flush buffer), thanks to
diff --git a/libraries/export/csv.php b/libraries/export/csv.php
index aee7a4303..0c6f525e5 100644
--- a/libraries/export/csv.php
+++ b/libraries/export/csv.php
@@ -180,8 +180,9 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
                 if ($csv_enclosed == '') {
                     $schema_insert .= $row[$j];
                 } else {
+                    // also double the escape string if found in the data
                     $schema_insert .= $csv_enclosed
-                                   . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, $row[$j])
+                                   . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, str_replace($csv_escaped, $csv_escaped . $csv_escaped, $row[$j]))
                                    . $csv_enclosed;
                 }
             } else {