diff --git a/reference/dbx/constants.xml b/reference/dbx/constants.xml
index 83fae94556..f813e74a6b 100644
--- a/reference/dbx/constants.xml
+++ b/reference/dbx/constants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
  <section id="constants.dbx">
  &reftitle.constants;
  &extension.constants;
@@ -125,6 +125,39 @@
       </simpara>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term>
+      <constant>DBX_COLNAMES_UNCHANGED</constant> 
+      (<link linkend="language.types.integer">integer</link>)
+     </term>
+     <listitem>
+      <simpara>
+       
+      </simpara>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <constant>DBX_COLNAMES_UPPERCASE</constant> 
+      (<link linkend="language.types.integer">integer</link>)
+     </term>
+     <listitem>
+      <simpara>
+       
+      </simpara>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <constant>DBX_COLNAMES_LOWERCASE</constant> 
+      (<link linkend="language.types.integer">integer</link>)
+     </term>
+     <listitem>
+      <simpara>
+       
+      </simpara>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term>
       <constant>DBX_CMP_NATIVE</constant> 
diff --git a/reference/dbx/functions/dbx-query.xml b/reference/dbx/functions/dbx-query.xml
index 862497cbeb..9cfe45028a 100644
--- a/reference/dbx/functions/dbx-query.xml
+++ b/reference/dbx/functions/dbx-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/dbx.xml, last change in rev 1.3 -->
   <refentry id="function.dbx-query">
    <refnamediv>
@@ -51,7 +51,8 @@ dbx_close($link);
     <para>
      The <parameter>flags</parameter> parameter is used to control the amount of
      information that is returned. It may be any combination of the following 
-     constants with the bitwise OR operator (|):
+     constants with the bitwise OR operator (|). The DBX_COLNAMES_* flags 
+     override the dbx.colnames_case setting from <filename>php.ini</filename>.
      <variablelist>
       <varlistentry>
        <term>
@@ -101,6 +102,38 @@ dbx_close($link);
         </simpara>
        </listitem>
       </varlistentry>
+      <varlistentry>
+       <term>
+        <constant>DBX_COLNAMES_UNCHANGED</constant>
+       </term>
+       <listitem>
+        <simpara>
+         The case of the returned column names will not be changed.
+        </simpara>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <constant>DBX_COLNAMES_UPPERCASE</constant>
+       </term>
+       <listitem>
+        <simpara>
+         The case of the returned column names will be changed to 
+         uppercase.
+        </simpara>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <constant>DBX_COLNAMES_LOWERCASE</constant>
+       </term>
+       <listitem>
+        <simpara>
+         The case of the returned column names will be changed to 
+         lowercase.
+        </simpara>
+       </listitem>
+      </varlistentry>
      </variablelist>
      Note that <constant>DBX_RESULT_INDEX</constant> is always used, regardless 
      of the actual value of <parameter>flags</parameter> parameter. This means 
diff --git a/reference/dbx/ini.xml b/reference/dbx/ini.xml
new file mode 100644
index 0000000000..a1e6a018aa
--- /dev/null
+++ b/reference/dbx/ini.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.1 $ -->
+<section id="dbx.configuration">
+ &reftitle.runtime;
+ &extension.runtime;
+ <para>
+  <table>
+   <title>DBX Configuration Options</title>
+   <tgroup cols="3">
+    <thead>
+     <row>
+      <entry>Name</entry>
+      <entry>Default</entry>
+      <entry>Changeable</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>dbx.colnames_case</entry>
+      <entry>"unchanged"</entry>
+      <entry>PHP_INI_SYSTEM</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </table>
+  For further details and definition of the PHP_INI_* constants see
+  <function>ini_set</function>.
+</para>
+<para>
+ Here is a short explanation of the configuration directives.
+ <variablelist>
+   <varlistentry id="ini.dbx.colnames-case">
+   <term>
+    <parameter>dbx.colnames_case</parameter>
+    <type>string</type>
+   </term>
+   <listitem>
+    <para>
+     Columns names can be returned "unchanged" or converted to
+     "uppercase" or "lowercase". This directive can be overridden
+     with a flag to <function>dbx_query</function>.
+    </para>
+   </listitem>
+  </varlistentry>
+ 
+ </variablelist>
+ </para>
+</section>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
+
diff --git a/reference/dbx/reference.xml b/reference/dbx/reference.xml
index cc7228f423..9c88c42e37 100644
--- a/reference/dbx/reference.xml
+++ b/reference/dbx/reference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 
 <!-- 
     If anyone from the translator group has problems with the 
@@ -87,11 +87,8 @@
      specific documentation.
     </para>
    </section>
-   
-   <section id="dbx.runtime">
-    &reftitle.runtime;
-    &no.config;
-   </section>
+
+   &reference.dbx.ini;
 
    <section id="dbx.resources">
     &reftitle.resources;