diff --git a/ChangeLog b/ChangeLog
index 44890897a..a95927620 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-12-14 Michal Čihař  <michal@cihar.com>
+    * libraries/config.default.php, Documentation.html: Transliterate invalid
+      chars by default (RFE #1380255).
+
 2005-12-13 Michal Čihař  <michal@cihar.com>
     * querywindow.php: Fix query history displaying (bug #1374639).
 
diff --git a/Documentation.html b/Documentation.html
index c3e774b96..dd6c257e7 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -1410,7 +1410,8 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
     <dd>
         Specify some parameters for iconv used in charset conversion. See
         <a href="http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html">iconv
-        documentation</a> for details.
+        documentation</a> for details. By default <code>//TRANSLIT<code> is
+        used, so that invalid characters will be transliterated.
     </dd>
 
     <dt><b><a name="cfg_AvailableCharsets"></a>$cfg[AvailableCharsets] </b>array</dt>
diff --git a/libraries/config.default.php b/libraries/config.default.php
index c034ed110..add1dd6b0 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -401,7 +401,7 @@ $cfg['RecodingEngine'] = 'auto';
 // Specify some parameters for iconv used in charset conversion. See iconv
 // documentation for details:
 // http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
-$cfg['IconvExtraParams'] = '';
+$cfg['IconvExtraParams'] = '//TRANSLIT';
 
 // Available charsets for MySQL conversion. currently contains all which could
 // be found in lang/* files and few more.