diff --git a/wpa_supplicant.conf b/wpa_supplicant.conf
index 6d2b3cd..65ad645 100644
--- a/wpa_supplicant.conf
+++ b/wpa_supplicant.conf
@@ -1,8 +1,3 @@
 ctrl_interface=/var/run/wpa_supplicant
 ctrl_interface_group=wheel
 
-network={
-	ssid="any"
-	key_mgmt=NONE
-}
-
diff --git a/wpa_supplicant.init.d b/wpa_supplicant.init.d
index 0e98d42..0beaec7 100644
--- a/wpa_supplicant.init.d
+++ b/wpa_supplicant.init.d
@@ -18,21 +18,16 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
-# Check that networking is up.
-[ "$NETWORKING" = "no" ] && exit 0
-
 exec="/usr/sbin/wpa_supplicant"
 prog=$(basename $exec)
 conf="/etc/wpa_supplicant/wpa_supplicant.conf"
 lockfile=/var/lock/subsys/$prog
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-[ "$INTERFACES" != "" ] || exit 0
-[ "$DRIVERS" != "" ] || exit 0
 
 start() {
  	echo -n $"Starting $prog: $conf, $INTERFACES, $DRIVERS"
-	daemon $prog -c $conf $INTERFACES $DRIVERS -B
+	daemon $prog -c $conf $INTERFACES $DRIVERS -B -u -f
 	retval=$?
 	echo
 	[ $retval -eq 0 ] && touch $lockfile
diff --git a/wpa_supplicant.service b/wpa_supplicant.service
new file mode 100644
index 0000000..0856d64
--- /dev/null
+++ b/wpa_supplicant.service
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=fi.epitest.hostap.WPASupplicant
+Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f
+User=root
+
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 4884850..a241a84 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -11,6 +11,7 @@ Source2: %{name}.conf
 Source3: %{name}.init.d
 Source4: %{name}.sysconfig
 Source5: madwifi-headers-r1475.tar.bz2
+Source6: %{name}.service
 Patch0: wpa_supplicant-assoc-timeout.patch
 Patch1: wpa_supplicant-driver-wext-debug.patch
 Patch2: wpa_supplicant-wep-key-fix.patch
@@ -81,8 +82,10 @@ install -d %{buildroot}/%{_sbindir}
 install -m 0755 wpa_passphrase %{buildroot}/%{_sbindir}
 install -m 0755 wpa_cli %{buildroot}/%{_sbindir}
 install -m 0755 wpa_supplicant %{buildroot}/%{_sbindir}
-mkdir -p %{buildroot}/%{_sysconfdir}/dbus-1/system.d/
+install -d %{buildroot}/%{_sysconfdir}/dbus-1/system.d/
 install -m 0644 dbus-wpa_supplicant.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
+install -d %{buildroot}/%{_datadir}/dbus-1/system-services/
+install -m 0644 %{SOURCE6} %{buildroot}/%{_datadir}/dbus-1/system-services
 
 # gui
 install -d %{buildroot}/%{_bindir}
@@ -118,11 +121,12 @@ fi
 
 %files
 %defattr(-, root, root)
-%doc COPYING ChangeLog README README-Windows.txt eap_testing.txt todo.txt wpa_supplicant.conf examples
+%doc COPYING ChangeLog README eap_testing.txt todo.txt wpa_supplicant.conf examples
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_sysconfdir}/rc.d/init.d/%{name}
 %{_sysconfdir}/dbus-1/system.d/%{name}.conf
+%{_datadir}/dbus-1/system-services/%{name}.service
 %{_sbindir}/wpa_passphrase
 %{_sbindir}/wpa_supplicant
 %{_sbindir}/wpa_cli
@@ -140,6 +144,8 @@ fi
 - Make SIGUSR1 change debug level on-the-fly; useful in combination with
     the -f switch to log output to /var/log/wpa_supplicant.log
 - Stop stripping binaries on install so we get debuginfo packages
+- Remove service start requirement for interfaces & devices from sysconfig file,
+    since wpa_supplicant's D-Bus interface is now turned on
 
 * Fri Aug 17 2007 Dan Williams <dcbw@redhat.com> - 0.5.7-6
 - Fix compilation with RPM_OPT_FLAGS (rh #249951)
diff --git a/wpa_supplicant.sysconfig b/wpa_supplicant.sysconfig
index 09c75f5..8301639 100644
--- a/wpa_supplicant.sysconfig
+++ b/wpa_supplicant.sysconfig
@@ -1,2 +1,2 @@
-INTERFACES="-iwlan0"
-DRIVERS="-Dwext"
+INTERFACES=""
+DRIVERS=""