diff --git a/reference/mysqli/constants.xml b/reference/mysqli/constants.xml
index b72f5a0bcf..c09485e856 100644
--- a/reference/mysqli/constants.xml
+++ b/reference/mysqli/constants.xml
@@ -37,6 +37,41 @@
      </para>
     </listitem>
    </varlistentry>
+   <varlistentry xml:id="constantmysqli-opt-int-and-float-native">
+    <term><constant>MYSQLI_OPT_INT_AND_FLOAT_NATIVE</constant></term>
+    <listitem>
+     <para>
+      Convert integer and float columns back to PHP numbers. Only valid for mysqlnd.
+      Available since PHP 5.3.0.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id="constantmysqli-opt-net-cmd-buffer-size">
+    <term><constant>MYSQLI_OPT_NET_CMD_BUFFER_SIZE</constant></term>
+    <listitem>
+     <para>
+      The size of the internal command/network buffer. Only valid for mysqlnd.
+      Available since PHP 5.3.0.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id="constantmysqli-opt-net-read-buffer-size">
+    <term><constant>MYSQLI_OPT_NET_READ_BUFFER_SIZE</constant></term>
+    <listitem>
+     <para>
+      Maximum read chunk size in bytes when reading the body of a MySQL command packet.
+      Only valid for mysqlnd. Available since PHP 5.3.0.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id="constantmysqli-opt-ssl-verify-server-cert">
+    <term><constant>MYSQLI_OPT_SSL_VERIFY_SERVER_CERT</constant></term>
+    <listitem>
+     <para>
+      Available since PHP 5.3.0. (MySQL 5.1.10 and up)
+     </para>
+    </listitem>
+   </varlistentry>
    <varlistentry xml:id="constantmysqli-init-command">
     <term><constant>MYSQLI_INIT_COMMAND</constant></term>
     <listitem>
@@ -626,6 +661,14 @@
      </para>
     </listitem>
    </varlistentry>
+   <varlistentry xml:id="constantmysqli-server-public-key">
+    <term><constant>MYSQLI_SERVER_PUBLIC_KEY</constant></term>
+    <listitem>
+     <para>
+      Available since PHP 5.5.0.
+     </para>
+    </listitem>
+   </varlistentry>
    <varlistentry xml:id="constantmysqli-refresh-grant">
     <term><constant>MYSQLI_REFRESH_GRANT</constant></term>
     <listitem>
@@ -761,7 +804,14 @@
      </para>
     </listitem>
    </varlistentry>
-
+   <varlistentry xml:id="constantmysqli-client-ssl-dont-verify-server-cert">
+    <term><constant>MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT</constant></term>
+    <listitem>
+     <para>
+      Available since PHP 5.6.16. (MySQL 5.6.5 and up)
+     </para>
+    </listitem>
+   </varlistentry>
   </variablelist>
 </appendix>
 
diff --git a/reference/mysqli/mysqli/options.xml b/reference/mysqli/mysqli/options.xml
index f99277b30e..1ab7bcce0f 100644
--- a/reference/mysqli/mysqli/options.xml
+++ b/reference/mysqli/mysqli/options.xml
@@ -84,32 +84,34 @@
            <entry><constant>MYSQLI_SERVER_PUBLIC_KEY</constant></entry>
            <entry>
              RSA public key file used with the SHA-256 based authentication.
+             Available since PHP 5.5.0.
            </entry>
           </row>
           <row>
            <entry><constant>MYSQLI_OPT_NET_CMD_BUFFER_SIZE</constant></entry>
            <entry>
              The size of the internal command/network buffer. Only valid for
-             mysqlnd.
+             mysqlnd. Available since PHP 5.3.0.
            </entry>
           </row>
           <row>
            <entry><constant>MYSQLI_OPT_NET_READ_BUFFER_SIZE</constant></entry>
            <entry>
              Maximum read chunk size in bytes when reading the body of a MySQL
-             command packet. Only valid for mysqlnd.
+             command packet. Only valid for mysqlnd. Available since PHP 5.3.0.
            </entry>
           </row>
           <row>
            <entry><constant>MYSQLI_OPT_INT_AND_FLOAT_NATIVE</constant></entry>
            <entry>
              Convert integer and float columns back to PHP numbers. Only valid
-             for mysqlnd.
+             for mysqlnd. Available since PHP 5.3.0.
            </entry>
           </row>
           <row>
            <entry><constant>MYSQLI_OPT_SSL_VERIFY_SERVER_CERT</constant></entry>
            <entry>
+            Available since PHP 5.3.0.
            </entry>
           </row>
          </tbody>
@@ -152,8 +154,7 @@
       <row>
        <entry>5.5.0</entry>
        <entry>
-        The <constant>MYSQLI_SERVER_PUBLIC_KEY</constant> and
-        <constant>MYSQLI_SERVER_PUBLIC_KEY</constant> options were added.
+        The <constant>MYSQLI_SERVER_PUBLIC_KEY</constant> option was added.
        </entry>
       </row>
       <row>