diff --git a/fi.w1.wpa_supplicant1.service b/fi.w1.wpa_supplicant1.service
index b308ec2..8f67aca 100644
--- a/fi.w1.wpa_supplicant1.service
+++ b/fi.w1.wpa_supplicant1.service
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=fi.w1.wpa_supplicant1
-Exec=/usr/sbin/wpa_supplicant -u
+Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f /var/log/wpa_supplicant.log
 User=root
diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes
index f8f5946..bacda39 100644
--- a/wpa_supplicant.changes
+++ b/wpa_supplicant.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Oct 10 13:28:43 UTC 2011 - lnussel@suse.de
+
+- use same exec line in fi.w1.wpa_supplicant1.service as in
+  fi.epitest.hostap.WPASupplicant.service
+- fix build on older distros
+- fix not using RPM_OPT_FLAGS
+- use %_smp_mflags
+
 -------------------------------------------------------------------
 Fri Sep 16 12:02:37 UTC 2011 - jengelh@medozas.de
 
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 541efb1..031bda4 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -19,7 +19,12 @@
 
 
 Name:           wpa_supplicant
-BuildRequires:  dbus-1-devel libnl-1_1-devel libqt4 libqt4-devel openssl-devel pkg-config readline-devel
+BuildRequires:  dbus-1-devel libqt4 libqt4-devel openssl-devel pkg-config readline-devel
+%if 0%{?suse_version} > 1140
+BuildRequires:  libnl-1_1-devel
+%else
+BuildRequires:  libnl-devel
+%endif
 Url:            http://hostap.epitest.fi/wpa_supplicant/
 Version:        0.7.3
 Release:        6
@@ -83,10 +88,10 @@ cp %{SOURCE1} wpa_supplicant/.config
 
 %build
 cd wpa_supplicant
-CFLAGS="$RPM_OPT_FLAGS" make %{?jobs:-j%jobs} 
+CFLAGS="$RPM_OPT_FLAGS" make V=1 %{?_smp_mflags}
 cd wpa_gui-qt4
-qmake QMAKE_CXXFLAGS="$RPM_OPT_FLAGS"
-make %{?jobs:-j%jobs}
+qmake QMAKE_CXXFLAGS="$RPM_OPT_FLAGS" QMAKE_CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
 install -d %{buildroot}/%{_sbindir}