diff --git a/wpa_supplicant-fix_dbus_config.patch b/wpa_supplicant-fix_dbus_config.patch
index c2032a4..7db1cde 100644
--- a/wpa_supplicant-fix_dbus_config.patch
+++ b/wpa_supplicant-fix_dbus_config.patch
@@ -1,13 +1,23 @@
---- wpa_supplicant-0.6.4/wpa_supplicant/dbus-wpa_supplicant.conf
-+++ wpa_supplicant-0.6.4/wpa_supplicant/dbus-wpa_supplicant.conf
-@@ -5,8 +5,8 @@
+Index: wpa_supplicant-0.6.9/wpa_supplicant/dbus-wpa_supplicant.conf
+===================================================================
+--- wpa_supplicant-0.6.9.orig/wpa_supplicant/dbus-wpa_supplicant.conf
++++ wpa_supplicant-0.6.9/wpa_supplicant/dbus-wpa_supplicant.conf
+@@ -4,13 +4,10 @@
+ <busconfig>
          <policy user="root">
                  <allow own="fi.epitest.hostap.WPASupplicant"/>
- 
--                <allow send_destination="fi.epitest.hostap.WPASupplicant"/>
+-
+                 <allow send_destination="fi.epitest.hostap.WPASupplicant"/>
 -                <allow send_interface="fi.epitest.hostap.WPASupplicant"/>
+-        </policy>
+-        <policy context="default">
+-                <deny own="fi.epitest.hostap.WPASupplicant"/>
+-                <deny send_destination="fi.epitest.hostap.WPASupplicant"/>
+-                <deny send_interface="fi.epitest.hostap.WPASupplicant"/>
+-        </policy>
++         </policy>
++         <policy context="default">
 +                <allow send_destination="fi.epitest.hostap.WPASupplicant"
-+                       send_interface="fi.epitest.hostap.WPASupplicant"/>
-         </policy>
-         <policy context="default">
-                 <deny own="fi.epitest.hostap.WPASupplicant"/>
++                       send_interface="org.freedesktop.DBus.Introspectable"/>
++         </policy>
+ </busconfig>
diff --git a/wpa_supplicant-fix_dbus_config2.patch b/wpa_supplicant-fix_dbus_config2.patch
deleted file mode 100644
index a0b8552..0000000
--- a/wpa_supplicant-fix_dbus_config2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur BUILD/wpa_supplicant-0.6.4/wpa_supplicant/dbus-wpa_supplicant.conf BUILD2/wpa_supplicant-0.6.4/wpa_supplicant/dbus-wpa_supplicant.conf
---- BUILD/wpa_supplicant-0.6.4/wpa_supplicant/dbus-wpa_supplicant.conf	2009-01-28 10:43:48.000000000 +0100
-+++ BUILD2/wpa_supplicant-0.6.4/wpa_supplicant/dbus-wpa_supplicant.conf	2009-01-27 11:05:48.000000000 +0100
-@@ -7,7 +7,13 @@
- 
-                 <allow send_destination="fi.epitest.hostap.WPASupplicant"
-                        send_interface="fi.epitest.hostap.WPASupplicant"/>
--        </policy>
-+                <allow send_destination="fi.epitest.hostap.WPASupplicant"
-+                       send_interface="fi.epitest.hostap.WPASupplicant.Interface"/>
-+                <allow send_destination="fi.epitest.hostap.WPASupplicant"
-+                       send_interface="fi.epitest.hostap.WPASupplicant.Network"/>
-+                <allow send_destination="fi.epitest.hostap.WPASupplicant"
-+                       send_interface="fi.epitest.hostap.WPASupplicant.BSSID"/>
-+         </policy>
-         <policy context="default">
-                 <deny own="fi.epitest.hostap.WPASupplicant"/>
-                 <deny send_destination="fi.epitest.hostap.WPASupplicant"/>
diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes
index 0c789c9..156da4e 100644
--- a/wpa_supplicant.changes
+++ b/wpa_supplicant.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 28 08:44:02 UTC 2009 - lnussel@suse.de
+
+- simplify dbus config, allow introspection
+
 -------------------------------------------------------------------
 Mon Sep  7 19:41:35 UTC 2009 - claes.backstrom@fsfe.org
 
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index d18118b..30d8541 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -22,8 +22,8 @@ Name:           wpa_supplicant
 BuildRequires:  dbus-1-devel libnl-devel libqt4 libqt4-devel openssl-devel pkg-config readline-devel
 Url:            http://hostap.epitest.fi/wpa_supplicant/
 Version:        0.6.9
-Release:        3
-License:        BSD 3-clause (or similar) ; GPL v2 or later
+Release:        4
+License:        BSD3c(or similar) ; GPLv2+
 Group:          Productivity/Networking/Other
 Summary:        WPA supplicant implementation
 Source:         http://hostap.epitest.fi/releases/wpa_supplicant-%{version}.tar.bz2
@@ -42,7 +42,7 @@ Patch3:         wpa_supplicant-dbus-iface-segfault-fix.patch
 Patch4:         wpa_supplicant-errormsg.patch
 Patch5:         wpa_supplicant-dbus-reset-eapol.patch
 Patch6:         wpa_supplicant-fix_dbus_config.patch
-Patch7:         wpa_supplicant-fix_dbus_config2.patch
+#Patch7:         wpa_supplicant-fix_dbus_config2.patch
 # wpa_supplicant-roaming.patch won't go upstream as it is an ugly hack, once
 # roaming is implemented in a clean way this patch should be removed
 Patch8:         wpa_supplicant-roaming.patch
@@ -63,7 +63,7 @@ Authors:
     Jouni Malinen <jkmaline@cc.hut.fi>
 
 %package gui
-License:        BSD 3-clause (or similar) ; GPL v2 or later
+License:        BSD3c(or similar) ; GPLv2+
 Summary:        WPA supplicant graphical front-end
 Requires:       wpa_supplicant
 Group:          System/Monitoring
@@ -88,7 +88,7 @@ cp %{SOURCE1} wpa_supplicant/.config
 %patch4 -p2
 %patch5 -p1
 %patch6 -p1
-%patch7 -p2
+#patch7 -p1
 %patch8 -p2
 %patch9 -p2