diff --git a/dnsmasq.changes b/dnsmasq.changes
index 0a010c3..9cde372 100644
--- a/dnsmasq.changes
+++ b/dnsmasq.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Nov 24 20:45:37 UTC 2011 - crrodriguez@opensuse.org
+
+- Must be of type forking and change uid to dnsmasq 
+
+-------------------------------------------------------------------
+Thu Nov 24 20:19:11 UTC 2011 - crrodriguez@opensuse.org
+
+- Add systemd startup script 
+
 -------------------------------------------------------------------
 Thu Oct 20 15:58:50 CEST 2011 - ug@suse.de
 
diff --git a/dnsmasq.service b/dnsmasq.service
new file mode 100644
index 0000000..1a441d0
--- /dev/null
+++ b/dnsmasq.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=DNS caching server.
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/dnsmasq.pid
+ExecStart=/usr/sbin/dnsmasq -u dnsmasq
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 752aa3e..16ff670 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -28,6 +28,7 @@ PreReq:         /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir
 Url:            http://www.thekelleys.org.uk/dnsmasq/
 Source:         %{name}-%{version}.tar.bz2
 Source1:        vendor-files.tar.bz2
+Source2:        dnsmasq.service
 Patch1:         group_and_isc.diff
 Patch3:         manpage.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -83,6 +84,7 @@ install -m 644 SuSEFirewall.dnsmasq-dns ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconf
 install -m 644 SuSEFirewall.dnsmasq-dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/dnsmasq-dhcp
 install -d 755 ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/
 install -m 644 dbus/dnsmasq.conf ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf
+install -D -m 0644 %SOURCE2 %{buildroot}/lib/systemd/system/dnsmasq.service
 %find_lang %{name}
 
 %files -f %{name}.lang
@@ -100,5 +102,6 @@ install -m 644 dbus/dnsmasq.conf ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.c
 %{_mandir}/fr/man8/dnsmasq.8.gz
 %{_mandir}/es/man8/dnsmasq.8.gz
 /etc/dbus-1/system.d/dnsmasq.conf
+/lib/systemd/system/dnsmasq.service
 
 %changelog