diff --git a/ypbind.init b/ypbind.init
index 0e255d5..5d8eb82 100755
--- a/ypbind.init
+++ b/ypbind.init
@@ -14,6 +14,18 @@
 #
 # See https://fedoraproject.org/wiki/Packaging:SysVInitScript for
 # the guidelines document.
+### BEGIN INIT INFO
+# Provides: ypbind
+# Required-Start: $local_fs $remote_fs $network $rpcbind
+# Required-Stop: $local_fs $remote_fs $network $rpcbind
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
+# Short-Description: Starts the ypbind daemon
+# Description: This is a daemon which runs on NIS/YP clients and binds them \
+#              to a NIS domain. It must be running for systems based on glibc \
+#              to work as NIS clients, but it should not be enabled on systems \
+#              which are not using NIS.
+### END INIT INFO
 
 OTHER_YPBIND_OPTS=""
 
@@ -92,17 +104,13 @@ start() {
     # the following fixes problems with the init scripts continuing
     # even when we are really not bound yet to a server, and then things
     # that need NIS fail.
-    timeout=10
+    timeout=$NISTIMEOUT
     firsttime=1
     SECONDS=0
-    while [ $SECONDS -lt $timeout ]; do
+    while [ $SECONDS -lt $timeout ] || [ $firsttime -eq 1 ] ; do
+	firsttime=0
 	if /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind
 	then
-	    if [ $firsttime -eq 1 ]; then
-		# reset timeout
-		timeout=$NISTIMEOUT
-		firsttime=0
-	    fi
 	    /usr/bin/ypwhich > /dev/null 2>&1
 	    retval=$?
 	    if [ $retval -eq 0 ]; then
diff --git a/ypbind.spec b/ypbind.spec
index ecad856..f40ab44 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.32
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -79,6 +79,12 @@ fi
 %doc README NEWS COPYING
 
 %changelog
+* Mon Nov 21 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-3
+- fixed firsttime handling in ypbind.init wait cycle
+
+* Tue Nov 15 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-2
+- Fixed init script to handle long rpcinfo requests
+
 * Thu Jul  8 2010 Karel Klic <kklic@redhat.com> - 3:1.32-1
 - Update to new version which contains the -matches.patch