diff --git a/ypbind.init b/ypbind.init
index e1fb7d8..dba9ffe 100755
--- a/ypbind.init
+++ b/ypbind.init
@@ -43,7 +43,7 @@ start() {
 	# that need NIS fail.
 	echo -n $"Listening for an NIS domain server."
 	for (( times = 1; times < 20; times++ )); do
-	    /usr/sbin/rpcinfo -p | grep ypbind > /dev/null 2>&1 && ypwhich > /dev/null 2>&1
+	    /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind && ypwhich > /dev/null 2>&1
 	    RETVAL=$?
 	    if [ $RETVAL -eq 0 ]; then
 		break;
diff --git a/ypbind.spec b/ypbind.spec
index 25a675e..c28b14d 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.17.2
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -84,6 +84,10 @@ exit 0
 %doc README NEWS
 
 %changelog
+* Fri Oct 15 2004 Steve Dickson <SteveD@RedHat.com>
+- Sped up the ypbind initscript by using fgrep
+  instead of grep (bz# 81247)
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt