diff --git a/ypbind.service b/ypbind.service
index 67d1a06..23f6b0b 100644
--- a/ypbind.service
+++ b/ypbind.service
@@ -2,6 +2,7 @@
 [Unit]
 Description=NIS/YP (Network Information Service) Clients to NIS Domain Binder
 Requires=rpcbind.service
+Wants=nss-user-lookup.target
 After=syslog.target network-online.target rpcbind.service ypserv.service NetworkManager-wait-online.service
 Before=systemd-user-sessions.service
 Before=nss-user-lookup.target
diff --git a/ypbind.spec b/ypbind.spec
index 02e603e..168c93e 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Epoch: 3
 Version: 1.38
-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
@@ -102,6 +102,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind
 %license COPYING
 
 %changelog
+* Mon Mar 20 2017 Petr Kubat <pkubat@redhat.com> - 3:1.38-9
+- Add a Wants dependency on nss-user-lookup.target (#1282440)
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3:1.38-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild