diff --git a/ChangeLog b/ChangeLog
index d31a3e77a..a60c32647 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-09-09 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/common.lib.php: bug #1554166, magic_quotes_runtime
+
 2006-09-08 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/check_lang.sh: ignore differences in doc_lang
     * lang/italian: Update, thanks to Rebe - rebeluca.
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 685a1583b..5609f4c86 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -57,6 +57,12 @@ if (defined('E_STRICT')) {
 
 @ini_set('zend.ze1_compatibility_mode',false);
 
+/**
+ * Avoid problems with magic_quotes_runtime
+ */
+
+@ini_set('magic_quotes_runtime',false);
+
 
 /******************************************************************************/
 /* definition of functions         LABEL_definition_of_functions              */