diff --git a/ChangeLog b/ChangeLog
index 212ce1110..94144d215 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,7 @@ $Source$
       bug #1436279 Left frame links open in new windows in Safari
     * libraries/footer.inc.php, themes/*/img/window-new.png *NEW*:
       added icon for new window
+    * libraries/dbi/mysqli.dbi.lib.php: workaround for http://bugs.php.net/36007
 
 2006-02-21 Michal Čihař  <michal@cihar.com>
     * scripts/setup.php:
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 8bcd8b84a..45c87601a 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -40,6 +40,16 @@ if (! defined('MYSQLI_BINARY_FLAG')) {
    define('MYSQLI_BINARY_FLAG', 128);
 }
 
+/**
+ * @see http://bugs.php.net/36007
+ */
+if (! defined('MYSQLI_TYPE_NEWDECIMAL')) {
+    define('MYSQLI_TYPE_NEWDECIMAL', 246);
+}
+if (! defined('MYSQLI_TYPE_BIT')) {
+    define('MYSQLI_TYPE_BIT', 16);
+}
+
 /**
  * connects to the database server
  *