diff --git a/dnsmasq.changes b/dnsmasq.changes
index 76677db..c311ab2 100644
--- a/dnsmasq.changes
+++ b/dnsmasq.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 17 01:45:33 UTC 2015 - crrodriguez@opensuse.org
+
+- dnsmasq.service: Order Before=nss-lookup.target  and 
+  Wants=nss-lookup.target as this service may provide
+  name resolution even for the localhost.
+
 -------------------------------------------------------------------
 Mon Apr 20 12:14:54 UTC 2015 - abergmann@suse.com
 
diff --git a/dnsmasq.service b/dnsmasq.service
index db089b5..189fc17 100644
--- a/dnsmasq.service
+++ b/dnsmasq.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=DNS caching server.
 After=network.target
+Wants=nss-lookup.target
+Before=nss-lookup.target
 
 [Service]
 Type=dbus
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 39fe938..d793fc4 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dnsmasq
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed