diff --git a/ypbind-helpman.patch b/ypbind-helpman.patch
index 82771b3..d727b9c 100644
--- a/ypbind-helpman.patch
+++ b/ypbind-helpman.patch
@@ -1,6 +1,6 @@
-diff -up ./man/ypbind.8.helpman ./man/ypbind.8
---- ./man/ypbind.8.helpman	2013-05-07 11:22:51.178888612 +0200
-+++ ./man/ypbind.8	2013-05-07 11:23:20.497891948 +0200
+diff -up ypbind-mt-1.37.1/man/ypbind.8.helpman ypbind-mt-1.37.1/man/ypbind.8
+--- ypbind-mt-1.37.1/man/ypbind.8.helpman	2013-08-19 14:54:57.322653921 +0200
++++ ypbind-mt-1.37.1/man/ypbind.8	2013-08-19 14:54:57.325653921 +0200
 @@ -31,9 +31,11 @@
  ypbind \- NIS binding process
  .SH "SYNOPSIS"
@@ -14,7 +14,7 @@ diff -up ./man/ypbind.8.helpman ./man/ypbind.8
  .SH "DESCRIPTION"
  .PP
  \fBypbind\fR
-@@ -164,7 +166,7 @@ on the local machine is allowed to chang
+@@ -169,7 +171,7 @@ on the local machine is allowed to chang
  only checks if the config file has syntax errors and exits\&.
  .RE
  .PP
@@ -23,7 +23,7 @@ diff -up ./man/ypbind.8.helpman ./man/ypbind.8
  .RS 4
  starts
  \fBypbind\fR
-@@ -173,13 +175,13 @@ in debug mode\&.
+@@ -178,13 +180,13 @@ in debug mode\&.
  will not put itself into background, and error messages and debug output are written to standard error\&.
  .RE
  .PP
@@ -39,7 +39,7 @@ diff -up ./man/ypbind.8.helpman ./man/ypbind.8
  .RS 4
  Causes
  \fBypbind\fR
-@@ -188,7 +190,7 @@ to syslog(2) any and all changes in the
+@@ -193,7 +195,7 @@ to syslog(2) any and all changes in the
  .PP
  \fB\-broken\-server\fR
  .RS 4
@@ -48,7 +48,7 @@ diff -up ./man/ypbind.8.helpman ./man/ypbind.8
  \fBypbind\fR
  accept answers from servers running on an illegal port number\&. This should usually be avoided, but is required by some
  \fBypserv\fR(8)
-@@ -218,20 +220,36 @@ and not
+@@ -223,20 +225,36 @@ and not
  will only bind to the loopback device and is not reachable from a remote network\&.
  .RE
  .PP
@@ -87,9 +87,9 @@ diff -up ./man/ypbind.8.helpman ./man/ypbind.8
  \fB\-no\-dbus\fR
  .RS 4
  Disables DBUS support if compiled in\&.
-diff -up ./src/ypbind-mt.c.helpman ./src/ypbind-mt.c
---- ./src/ypbind-mt.c.helpman	2013-04-09 16:03:47.000000000 +0200
-+++ ./src/ypbind-mt.c	2013-05-07 11:22:51.180888612 +0200
+diff -up ypbind-mt-1.37.1/src/ypbind-mt.c.helpman ypbind-mt-1.37.1/src/ypbind-mt.c
+--- ypbind-mt-1.37.1/src/ypbind-mt.c.helpman	2013-04-09 16:03:47.000000000 +0200
++++ ypbind-mt-1.37.1/src/ypbind-mt.c	2013-08-19 14:54:57.326653921 +0200
 @@ -513,12 +513,17 @@ usage (int ret)
      output = stdout;
  
diff --git a/ypbind-mt-1.36-nistimeout.patch b/ypbind-mt-1.36-nistimeout.patch
index 64a8eae..b3dbc84 100644
--- a/ypbind-mt-1.36-nistimeout.patch
+++ b/ypbind-mt-1.36-nistimeout.patch
@@ -1,7 +1,7 @@
-diff -up ./man/ypbind.8.nistimeout ./man/ypbind.8
---- ./man/ypbind.8.nistimeout	2013-04-09 14:31:04.000000000 +0200
-+++ ./man/ypbind.8	2013-05-06 19:11:20.509665809 +0200
-@@ -104,6 +104,31 @@ will behave as usual and assumes there i
+diff -up ypbind-mt-1.37.1/man/ypbind.8.nistimeout ypbind-mt-1.37.1/man/ypbind.8
+--- ypbind-mt-1.37.1/man/ypbind.8.nistimeout	2013-04-09 14:31:04.000000000 +0200
++++ ypbind-mt-1.37.1/man/ypbind.8	2013-08-19 14:53:53.837656513 +0200
+@@ -104,6 +104,36 @@ will behave as usual and assumes there i
  will reread all configuration files, registers at the local portmapper and try to search NIS servers\&. If NetworkManager drops a connection,
  \fBypbind\fR
  will unregister from portmapper\&.
@@ -25,11 +25,16 @@ diff -up ./man/ypbind.8.nistimeout ./man/ypbind.8
 +in /etc/sysconfig/ypbind. For example NISTIMEOUT=180 means ypbind will wait up to 180 seconds for binding to a NIS server.
 +Another option is to enable NetworkManager-wait-online.service and add an ordering rule into
 +\fBypbind.service\fR,
-+ideally by creating /etc/systemd/system/ypbind.service with the following content:
++ideally by creating /etc/systemd/system/ypbind.service.d/wait-online.conf with the following content:
 +
-+        .include /lib/systemd/system/ypbind.service  
 +        [Service]
 +        After=NetworkManager-wait-online.service
++
++If you need to pass other arguments to
++\fBypbind\fR
++daemon withing systemd unit file, you can set these arguments as
++\fBOTHER_YPBIND_OPTS\fR
++environment variable in /etc/sysconfig/ypbind. For example in order to set a fixed port ypbind should run on, you can specify OTHER_YPBIND_OPTS="-p 876" in /etc/sysconfig/ypbind\&.
  .SH "OPTIONS"
  .PP
  \fB\-broadcast\fR
diff --git a/ypbind.service b/ypbind.service
index 9e8d2ec..f58ae3c 100644
--- a/ypbind.service
+++ b/ypbind.service
@@ -1,3 +1,4 @@
+# For details how to adjust this file or change daemon settings, please, read ypbind(8).
 [Unit]
 Description=NIS/YP (Network Information Service) Clients to NIS Domain Binder
 Requires=rpcbind.service
diff --git a/ypbind.spec b/ypbind.spec
index 6d3e4f1..374578d 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Epoch: 3
 Version: 1.37.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2
@@ -98,6 +98,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind
 %doc README NEWS COPYING
 
 %changelog
+* Mon Aug 19 2013 Honza Horak <hhorak@redhat.com> - 3:1.37.1-6
+- Improve systemd documentation
+
 * Mon Jul 29 2013 Honza Horak <hhorak@redhat.com> - 3:1.37.1-5
 - Remove SysV init conversion and systemd macros compatible code
 - Require systemd instead systemd-units