diff --git a/language/context/ssl.xml b/language/context/ssl.xml
index 2c0e895b49..8830ba9a83 100644
--- a/language/context/ssl.xml
+++ b/language/context/ssl.xml
@@ -165,6 +165,31 @@
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry xml:id="context.ssl.sni-enabled">
+     <term>
+      <parameter>SNI_enabled</parameter>
+      <type>boolean</type>
+     </term>
+     <listitem>
+      <para>
+       If set to &true; server name indication will be enabled. Enabling SNI 
+       allows multiple certificates on the same IP address.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry xml:id="context.ssl.sni-server-name">
+     <term>
+      <parameter>SNI_server_name</parameter>
+      <type>string</type>
+     </term>
+     <listitem>
+      <para>
+       If set, then this value will be used as server name for server name 
+       indication. If this value is not set, then the server name is guessed 
+       based on the hostname used when opening the stream.
+      </para>
+     </listitem>
+    </varlistentry>
    </variablelist>
   </para>
  </refsect1><!-- }}} -->
@@ -181,6 +206,13 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>5.3.2</entry>
+       <entry>
+        Added <parameter>SNI_enabled</parameter> and
+        <parameter>SNI_server_name</parameter>.
+       </entry>
+      </row>
       <row>
        <entry>5.0.0</entry>
        <entry>
@@ -205,6 +237,12 @@
     any context options which apply to <literal>ssl://</literal> also apply to
     <literal>https://</literal> and <literal>ftps://</literal>.
    </simpara>
+   <simpara>
+    For SNI (Server Name Indication) to be available, then PHP must be compiled 
+    with OpenSSL 0.9.8j or greater. Use the 
+    <constant>OPENSSL_TLSEXT_SERVER_NAME</constant> to determine whether SNI is 
+    supported.
+   </simpara>
   </note>
  </refsect1>
 
diff --git a/reference/openssl/constants.xml b/reference/openssl/constants.xml
index cd779cb703..be713abb80 100644
--- a/reference/openssl/constants.xml
+++ b/reference/openssl/constants.xml
@@ -427,6 +427,26 @@
    <para>These constants were added in 5.2.0.</para>
   </note>
  </section>
+
+ <section xml:id="openssl.constsni">
+  <title>Version constants</title>
+  <variablelist>
+    <varlistentry>
+      <term>
+        <constant>OPENSSL_TLSEXT_SERVER_NAME</constant>
+        (<type>string</type>)
+      </term>
+      <listitem>
+        <simpara>
+         Whether SNI support is available or not.
+        </simpara>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  <note>
+   <para>This constant were added in 5.3.2.</para>
+  </note>
+ </section>
  
 </appendix>