diff --git a/ypbind-pre-setdomain b/ypbind-pre-setdomain
index 7ef5fc8..1d5dbed 100755
--- a/ypbind-pre-setdomain
+++ b/ypbind-pre-setdomain
@@ -27,5 +27,12 @@ if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then
     fi
 fi
 
+#/etc/rpc check
+grep ypbind /etc/rpc > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+    logger -t ypbind $"Error: Missing ypbind entry in /etc/rpc."
+    exit 1
+fi
+
 echo 
 
diff --git a/ypbind.spec b/ypbind.spec
index e8b607a..30fa951 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: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2
@@ -139,6 +139,10 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind
 %doc README NEWS COPYING
 
 %changelog
+* Wed Dec 19 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-9
+- Check presence of ypbind in /etc/rpc
+  Related: #888778
+
 * Fri Nov 30 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-8
 - Build with full relro