diff --git a/cups-ypbind.patch b/cups-ypbind.patch
new file mode 100644
index 0000000..f942708
--- /dev/null
+++ b/cups-ypbind.patch
@@ -0,0 +1,12 @@
+diff -up cups-2.2.0/scheduler/org.cups.cupsd.service.in.ypbind cups-2.2.0/scheduler/org.cups.cupsd.service.in
+--- cups-2.2.0/scheduler/org.cups.cupsd.service.in.ypbind	2017-09-22 16:51:39.053585694 +0200
++++ cups-2.2.0/scheduler/org.cups.cupsd.service.in	2017-09-22 16:52:02.588403584 +0200
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
+-After=network.target
++After=network.target ypbind.service
+ 
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
diff --git a/cups.spec b/cups.spec
index d4f5279..2374471 100644
--- a/cups.spec
+++ b/cups.spec
@@ -15,7 +15,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 2.2.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
 Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@@ -64,6 +64,7 @@ Patch36: cups-web-devices-timeout.patch
 Patch37: cups-synconclose.patch
 Patch38: cups-cpu-hammering.patch
 Patch39: cups-resolv_reload.patch
+Patch40: cups-ypbind.patch
 
 Patch100: cups-lspp.patch
 
@@ -261,6 +262,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch38 -p1 -b .cpu-hammering
 # CUPS does not recognize changes to /etc/resolv.conf until CUPS restart (bug #1437065)
 %patch39 -p1 -b .resolv_reload
+# CUPS may fail to start if NIS groups are used (bug #1494558)
+%patch40 -p1 -b .ypbind
 
 %if %{lspp}
 # LSPP support.
@@ -626,6 +629,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Fri Sep 22 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.0-10
+- 1494558 - CUPS may fail to start if NIS groups are used
+
 * Thu Apr 27 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.0-9
 - copying cups-resolv_reload.patch from RHEL