diff --git a/ChangeLog b/ChangeLog
index 2fced0635..093c38ca8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2006-02-18 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_change.php: bug #1415465, undefined $sql_query
+    * libraries/common.lib.php: bug #1377215, errors with E_STRICT
 
 2006-02-18 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/sql_query_form.lib.php:
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 826c60a54..8f6b1542d 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -36,6 +36,16 @@
  *   release number
  */
 
+/**
+ * For now, avoid warnings of E_STRICT mode
+ * (this must be done before function definitions)
+ */
+
+if (defined('E_STRICT')) {
+    $old_error_reporting = error_reporting(0);
+    error_reporting($old_error_reporting ^ E_STRICT);
+    unset($old_error_reporting);
+}
 
 /******************************************************************************/
 /* definition of functions         LABEL_definition_of_functions              */