diff --git a/ypbind.init b/ypbind.init
index 7ab6a97..141dff5 100755
--- a/ypbind.init
+++ b/ypbind.init
@@ -82,29 +82,23 @@ start() {
 	# even when we are really not bound yet to a server, and then things
 	# that need NIS fail.
 	timeout=10
-	failure=0
-	while [ $timeout -gt 0 ]; do
+	firsttime=1
+        SECONDS=0
+	while [ $SECONDS -lt $timeout ]; do
 		if /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind
 		then
-			if [ $failure -eq 1 ]; then
+			if [ $firsttime -eq 1 ]; then
 				# reset timeout
 				timeout=$NISTIMEOUT
-				failure=0
+				firsttime=0
 			fi
 			/usr/bin/ypwhich > /dev/null 2>&1
-	    	RETVAL=$?
-	    	if [ $RETVAL -eq 0 ]; then
+		    	RETVAL=$?
+	    		if [ $RETVAL -eq 0 ]; then
 				break;
-	    	fi
-	    	# ypwhich has a hardcode 15sec timeout
-	    	# so subtract that from NISTIMEOUT to
-	    	# to see of we should continue to wait
-	    	timeout=`expr $timeout - 15` 
-		else # wait for ypbind to get started
-			sleep 2
-			timeout=`expr $timeout - 2`
-			failure=1
+	    		fi
 		fi
+		sleep 2
 		echo -n "..."
 	done
 	if [ $RETVAL -eq 0 ]; then
diff --git a/ypbind.spec b/ypbind.spec
index b97dd53..b6e21ed 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.20.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -91,6 +91,10 @@ exit 0
 %doc README NEWS
 
 %changelog
+* Fri May 23 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 3:1.20.4-5
+- Fix init script timing again
+  Resolves: #447307
+
 * Tue Feb 12 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 3:1.20.4-4
 - Fix Buildroot