diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes
index fd68959..fa06ed6 100644
--- a/wpa_supplicant.changes
+++ b/wpa_supplicant.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep  9 09:18:17 UTC 2013 - fcrozat@suse.com
+
+- Add systemd service file, to properly track wpa_supplicant is
+  its own systemd service (and not in dbus one).
+- Always enable systemd service, it is still dbus activated.
+
 -------------------------------------------------------------------
 Wed Apr 24 03:48:27 UTC 2013 - glin@suse.com
 
diff --git a/wpa_supplicant.service b/wpa_supplicant.service
new file mode 100644
index 0000000..67632b9
--- /dev/null
+++ b/wpa_supplicant.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=WPA Supplicant daemon
+Before=network.target
+
+[Service]
+Type=dbus
+BusName=fi.w1.wpa_supplicant1
+ExecStart=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f /var/log/wpa_supplicant.log
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 9b053a2..714dc6f 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -23,6 +23,10 @@ BuildRequires:  libqt4-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pkg-config
 BuildRequires:  readline-devel
+%if 0%{?suse_version} > 1230
+BuildRequires:  systemd-rpm-macros
+%systemd_requires
+%endif
 %if 0%{?suse_version} > 1140
 BuildRequires:  libnl-1_1-devel
 BuildRequires:  libnl3-devel
@@ -41,6 +45,7 @@ Source2:        %{name}.conf
 Source3:        fi.epitest.hostap.WPASupplicant.service
 Source4:        logrotate.wpa_supplicant
 Source5:        fi.w1.wpa_supplicant1.service
+Source6:        wpa_supplicant.service
 Patch0:         wpa_supplicant-driver-wext-debug.patch
 # wpa_supplicant-flush-debug-output.patch won't go upstream as it might
 # change timings
@@ -115,6 +120,25 @@ install -d %{buildroot}%{_mandir}/man{5,8}
 install -m 0644 wpa_supplicant/doc/docbook/*.8 %{buildroot}%{_mandir}/man8
 install -m 0644 wpa_supplicant/doc/docbook/*.5 %{buildroot}%{_mandir}/man5
 install -m 755 wpa_supplicant/wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir}
+%if 0%{?suse_version} > 1230
+install -d %{buildroot}%{_unitdir}
+install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}
+%endif
+
+%if 0%{?suse_version} > 1230
+%pre
+%service_add_pre wpa_supplicant.service
+
+%post
+%service_add_post wpa_supplicant.service
+systemctl --quiet enable wpa_supplicant.service || :
+
+%preun
+%service_del_preun wpa_supplicant.service
+
+%postun
+%service_del_postun wpa_supplicant.service
+%endif
 
 %files
 %defattr(-,root,root)
@@ -130,6 +154,9 @@ install -m 755 wpa_supplicant/wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir}
 %if 0%{?suse_version} > 1140
 %ghost %{_localstatedir}/run/%{name}
 %endif
+%if 0%{?suse_version} > 1200
+%{_unitdir}/wpa_supplicant.service
+%endif
 %dir %{_sysconfdir}/%{name}
 %doc %{_mandir}/man8/*
 %doc %{_mandir}/man5/*