diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 252378733f1..01f767d2565 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -658,6 +658,8 @@
 		
 		<listitem><para><link linkend="LDAPADMINDN"><parameter>ldap admin dn</parameter></link></para></listitem>
 		<listitem><para><link linkend="LDAPFILTER"><parameter>ldap filter</parameter></link></para></listitem>
+                <listitem><para><link linkend="LDAPPORT"><parameter>ldap port</parameter></link></para></listitem>
+                <listitem><para><link linkend="LDAPSERVER"><parameter>ldap server</parameter></link></para></listitem>
 		<listitem><para><link linkend="LDAPSSL"><parameter>ldap ssl</parameter></link></para></listitem>
 		<listitem><para><link linkend="LDAPSUFFIX"><parameter>ldap suffix</parameter></link></para></listitem>
 		<listitem><para><link linkend="LDAPUSERSUFFIX"><parameter>ldap user suffix</parameter></link></para></listitem>
@@ -3452,6 +3454,45 @@
 		</varlistentry>
 
 
+                <varlistentry>
+                <term><anchor id="LDAPPORT">ldap port (G)</term>
+                <listitem><para>This parameter is only available if Samba has been
+                configure to include the <command>--with-ldapsam</command> option
+                at compile time.
+                </para>
+
+                <para>
+                This option is used to control the tcp port number used to contact
+                the <link linkend="LDAPSERVER"><parameter>ldap server</parameter></link>.
+                The default is to use the stand LDAPS port 636.
+                </para>
+
+                <para>See Also: <link linkend="LDAPSSL">ldap ssl</link>
+                </para>
+
+                <para>Default : <command>ldap port = 636 ; if ldap ssl = on</command></para>
+                <para>Default : <command>ldap port = 389 ; if ldap ssl = off</command></para>
+                </listitem>
+                </varlistentry>
+
+
+                <varlistentry>
+                <term><anchor id="LDAPSERVER">ldap server (G)</term>
+                <listitem><para>This parameter is only available if Samba has been
+                configure to include the <command>--with-ldapsam</command> option
+                at compile time.
+                </para>
+
+                <para>
+                This parameter should contain the FQDN of the ldap directory
+                server which should be queried to locate user account information.
+                </para>
+
+                <para>Default : <command>ldap server = localhost</command></para>
+                </listitem>
+                </varlistentry>
+
+
 		<varlistentry>
 		<term><anchor id="LDAPSSL">ldap ssl (G)</term>
 		<listitem><para>This option is used to define whether or not Samba should