diff --git a/ypbind.service b/ypbind.service
index b24ac88..67d1a06 100644
--- a/ypbind.service
+++ b/ypbind.service
@@ -4,6 +4,7 @@ Description=NIS/YP (Network Information Service) Clients to NIS Domain Binder
 Requires=rpcbind.service
 After=syslog.target network-online.target rpcbind.service ypserv.service NetworkManager-wait-online.service
 Before=systemd-user-sessions.service
+Before=nss-user-lookup.target
 
 [Service]
 Type=notify
diff --git a/ypbind.spec b/ypbind.spec
index 4b2aa14..726e14f 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: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2
@@ -99,6 +99,10 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind
 %doc README NEWS COPYING
 
 %changelog
+* Mon Nov 16 2015 Matej Muzila <mmuzila@redhat.com> 3:1.38-3
+-  Load ypbind.service before nss-user-lookup.target
+   Resolves: rhbz#1282440
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3:1.38-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild