diff -up ypbind-mt-2.5/man/ypbind.8.xml.helpman ypbind-mt-2.5/man/ypbind.8.xml
--- ypbind-mt-2.5/man/ypbind.8.xml.helpman	2018-06-04 15:30:38.000000000 +0200
+++ ypbind-mt-2.5/man/ypbind.8.xml	2018-06-07 16:16:56.967024495 +0200
@@ -39,21 +39,33 @@
   <refsynopsisdiv id='synopsis'>
   <cmdsynopsis>
     <command>ypbind</command>
-      <arg choice='opt'>-c </arg>
-      <group choice='opt'><arg choice='plain'>-d </arg><arg choice='plain'>-debug </arg></group>
-      <arg choice='opt'>-verbose </arg>
-      <group choice='opt'><arg choice='plain'>-n </arg><arg choice='plain'>-forground </arg></group>
-      <arg choice='opt'>-broadcast </arg>
-      <arg choice='opt'>-broken-server </arg>
-      <arg choice='opt'>-ypset </arg>
-      <arg choice='opt'>-ypsetme </arg>
-      <arg choice='opt'>-no-ping </arg>
+      <group choice='opt'>
+          <arg choice='plain'>-broadcast </arg>
+          <arg choice='plain'>-ypset </arg>
+          <arg choice='plain'>-ypsetme </arg>
+      </group>
       <arg choice='opt'>-f <replaceable>configfile</replaceable></arg>
+      <arg choice='opt'>-no-ping </arg>
+      <arg choice='opt'>-broken-server </arg>
       <arg choice='opt'>-local-only </arg>
-      <arg choice='opt'>-ping-interval <replaceable>ping-interval</replaceable></arg>
+
+      <group choice='opt'>
+          <arg choice='plain'>-ping-interval <replaceable>ping-interval</replaceable></arg>
+          <arg choice='plain'>-i <replaceable>ping-interval</replaceable></arg>
+      </group>
+
+      <group choice='opt'><arg choice='plain'>-d </arg><arg choice='plain'>-debug </arg></group>
+      <group choice='opt'><arg choice='plain'>-v </arg><arg choice='plain'>-verbose </arg></group>
+      <group choice='opt'><arg choice='plain'>-n </arg><arg choice='plain'>-foreground </arg></group>
+      <arg choice='opt'>-p <replaceable>port</replaceable></arg>
   </cmdsynopsis>
   <cmdsynopsis>
     <command>ypbind</command>
+      <arg choice='plain'>-c </arg>
+      <arg choice='opt'>-f <replaceable>configfile</replaceable></arg>
+    </cmdsynopsis>
+  <cmdsynopsis>
+    <command>ypbind</command>
       <arg choice='plain'>--version </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -88,6 +100,8 @@
 
     <para>Unless the option
 <option>-debug</option>
+or
+<option>-foreground</option>
 is used, ypbind detaches itself from the controlling terminal and puts
 itself into background.
 <command>ypbind</command>
@@ -132,6 +146,57 @@ If the file does not exist or if there a
 <command>ypbind</command>
 exit.</para>
 
+<para>
+In Fedora we use systemd for starting services. We need to finish starting
+process of <command>ypbind</command> service not before service is fully
+started, which means <command>ypbind</command> daemon is prepared to answer.
+There is a test script <filename>/usr/libexec/ypbind-post-waitbind</filename>
+used in ypbind.service, that waits for <command>ypbind</command> daemon to be
+fully connected to NIS server and waits by default up to 45s.  Sometimes this
+is not enough, because network set up can take longer than 45s during boot, so
+starting ypbind.service fails. User can increase the timeout by setting an
+environment variable NISTIMEOUT in <filename>/etc/sysconfig/ypbind</filename>.
+For example NISTIMEOUT=180 means <command>ypbind</command> will wait up to 180
+seconds for binding to a NIS server.  Another option is to enable
+NetworkManager-wait- online.service, which will make <command>ypbind</command>
+to wait until network is properly set up.
+</para>
+
+<para>
+In case something needs to be changed in the ypbind.service, it is adviced not
+to change the ypbind.service directly, but rather to create a new file under
+<filename>/etc/systemd/system/ypbind.service.d/</filename>, i.e. if we need to
+start <command>ypbind</command> before service foo.service, we can create file
+<filename>/etc/systemd/system/ypbind.service.d/wait-foo.conf</filename> with
+the following content:
+</para>
+
+<para>
+<programlisting>
+[Service]
+Before=foo.service
+</programlisting>
+</para>
+<para>
+If you need to pass other arguments to <command>ypbind</command> daemon withing
+systemd unit file, you can set these arguments as OTHER_YPBIND_OPTS environment
+variable in <filename>/etc/sysconfig/ypbind</filename>. For example in order to
+set a fixed port <command>ypbind</command> should run on, you can specify
+OTHER_YPBIND_OPTS="-p 876" in <filename>/etc/sysconfig/ypbind</filename>.
+</para>
+
+<para>
+DHCP client by defualt changes <filename>/etc/yp.conf</filename> in case DHCP
+server sends NIS configuration in the respond. In that case
+<filename>/etc/dhcp/dhclient.d/nis.sh</filename> changes
+<filename>/etc/yp.conf</filename> according such configuration and creates a
+back-up copy of the original configuration file into
+<filename>/var/lib/dhclient/nis.conf.predhclient.$interface</filename>.  In
+order to disable changing <filename>/etc/yp.conf</filename> by DHCP client, add
+PEERNIS=no into <filename>/etc/sysconfig/network</filename>.
+</para>
+
+
   </refsect1>
 
   <refsect1 id='options'>
@@ -256,6 +321,15 @@ With this options another frequency in s
   </listitem>
   </varlistentry>
   <varlistentry>
+  <term><option>-p</option> port</term>
+  <listitem>
+<para>Lets
+<command>ypbind</command>
+listen on a specified port number, rather than asking portmapper to assingn a
+port for it.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
   <term><option>--version</option></term>
   <listitem>
 <para>Prints the version number</para>
diff -up ypbind-mt-2.5/man/yp.conf.5.xml.helpman ypbind-mt-2.5/man/yp.conf.5.xml
--- ypbind-mt-2.5/man/yp.conf.5.xml.helpman	2018-06-07 16:29:01.853560699 +0200
+++ ypbind-mt-2.5/man/yp.conf.5.xml	2018-06-07 16:33:59.302833043 +0200
@@ -97,6 +97,14 @@
       first the given servers before falling back to broadcasting
       for a running server.
     </para>
+    <para>
+      Content of <filename>/etc/yp.conf</filename> can be changed by DHCP client,
+      for more info see
+      <citerefentry>
+          <refentrytitle>ypbind</refentrytitle>
+          <manvolnum>8</manvolnum>
+      </citerefentry>.
+    </para>
   </refsect1>
 
   <refsect1 id='see_also'>