diff --git a/ypbind-post-waitbind b/ypbind-post-waitbind
index 7ef608c..e3ac27c 100755
--- a/ypbind-post-waitbind
+++ b/ypbind-post-waitbind
@@ -49,6 +49,8 @@ else
     logger -t ypbind \
         "Killing ypbind with PID $MAINPID."
     kill -s 15 $MAINPID || :
+    logger -t ypbind \
+        "Try increase NISTIMEOUT in /etc/sysconfig/ypbind"
 fi
 
 exit $retval
diff --git a/ypbind.spec b/ypbind.spec
index a7b503c..d2dadc8 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.36
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2
@@ -18,6 +18,7 @@ Patch1: ypbind-1.11-gettextdomain.patch
 Patch2: ypbind-mt-1.32-typo.patch
 Patch3: ypbind-mt-1.32-typo2.patch
 Patch4: ypbind-sigpipe.patch
+Patch5: ypbind-mt-1.36-nistimeout.patch
 # This is for /bin/systemctl
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -51,6 +52,7 @@ also need to install the ypserv package to a machine on your network.
 %patch2 -p1 -b .typo
 %patch3 -p1 -b .typo2
 %patch4 -p1 -b .sigpipe
+%patch5 -p1 -b .nistimeout
 
 %build
 %configure --enable-dbus-nm
@@ -115,6 +117,10 @@ fi
 %doc README NEWS COPYING
 
 %changelog
+* Thu Aug 23 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-5
+- Enhance ypbind(8) with info about NISTIMEOUT
+- Add suggestion about extending NISTIMEOUT if ypbind timeouts
+
 * Mon Jul 23 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-4
 - Add SIGPIPE to proper signal set
   Related: #842228