diff --git a/config b/config
index a9f82d0..ad64b9f 100644
--- a/config
+++ b/config
@@ -160,7 +160,7 @@ CONFIG_EAP_PAX=y
 CONFIG_EAP_LEAP=y
 
 # EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
-# CONFIG_EAP_AKA=y
+#CONFIG_EAP_AKA=y
 
 # EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
 # This requires CONFIG_EAP_AKA to be enabled, too.
@@ -337,9 +337,17 @@ CONFIG_IEEE80211W=y
 #CONFIG_NDIS_EVENTS_INTEGRATED=y
 #PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
 
-# Add support for DBus control interface
+# Add support for old DBus control interface
+# (fi.epitest.hostap.WPASupplicant)
 CONFIG_CTRL_IFACE_DBUS=y
 
+# Add support for new DBus control interface
+# (fi.w1.hostap.wpa_supplicant1)
+CONFIG_CTRL_IFACE_DBUS_NEW=y
+
+# Add introspection support for new DBus control interface
+CONFIG_CTRL_IFACE_DBUS_INTRO=y
+
 # Add support for loading EAP methods dynamically as shared libraries.
 # When this option is enabled, each EAP method can be either included
 # statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
diff --git a/wpa_supplicant-0.6.9.tar.bz2 b/wpa_supplicant-0.6.9.tar.bz2
deleted file mode 100644
index b4d0fc3..0000000
--- a/wpa_supplicant-0.6.9.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:443a04570db108521c3aaebd371daae8970089d90da9c08828109e8ef20ad906
-size 889846
diff --git a/wpa_supplicant-0.7.1.tar.bz2 b/wpa_supplicant-0.7.1.tar.bz2
new file mode 100644
index 0000000..77e3438
--- /dev/null
+++ b/wpa_supplicant-0.7.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc7258286d2eb87c470abca13e19135b3e0a9bc84d7be8a8500e73a560cc9b65
+size 1263708
diff --git a/wpa_supplicant-dbus-iface-segfault-fix.patch b/wpa_supplicant-dbus-iface-segfault-fix.patch
deleted file mode 100644
index 910e959..0000000
--- a/wpa_supplicant-dbus-iface-segfault-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c
---- BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c	2008-08-04 11:45:40.000000000 +0200
-+++ BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c	2008-08-04 11:45:24.000000000 +0200
-@@ -1818,7 +1818,8 @@
- 		wpa_clear_keys(wpa_s, NULL);
- 	}
- 
--	wpas_dbus_unregister_iface(wpa_s);
-+	if (wpa_s->global)
-+	  wpas_dbus_unregister_iface(wpa_s);
- 
- 	wpa_supplicant_cleanup(wpa_s);
- 
diff --git a/wpa_supplicant-dbus-reset-eapol.patch b/wpa_supplicant-dbus-reset-eapol.patch
deleted file mode 100644
index 6941b40..0000000
--- a/wpa_supplicant-dbus-reset-eapol.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: wpa_supplicant-0.6.4/wpa_supplicant/ctrl_iface_dbus_handlers.c
-===================================================================
---- wpa_supplicant-0.6.4.orig/wpa_supplicant/ctrl_iface_dbus_handlers.c
-+++ wpa_supplicant-0.6.4/wpa_supplicant/ctrl_iface_dbus_handlers.c
-@@ -1239,7 +1239,9 @@ DBusMessage * wpas_dbus_iface_set_smartc
- #endif /* EAP_TLS_OPENSSL */
- 
- 	eapol_sm_deinit(wpa_s->eapol);
-+	wpa_s->eapol = NULL;
- 	wpa_supplicant_init_eapol(wpa_s);
-+	wpa_sm_set_eapol(wpa_s->wpa, wpa_s->eapol);
- 
- 	return wpas_dbus_new_success_reply(message);
- 
diff --git a/wpa_supplicant-driver-wext-debug.patch b/wpa_supplicant-driver-wext-debug.patch
index 6b3e3ca..4c60e88 100644
--- a/wpa_supplicant-driver-wext-debug.patch
+++ b/wpa_supplicant-driver-wext-debug.patch
@@ -1,7 +1,8 @@
-diff -ur BUILD/wpa_supplicant-0.6.8/src/drivers/driver_wext.c BUILD2/wpa_supplicant-0.6.8/src/drivers/driver_wext.c
---- BUILD/wpa_supplicant-0.6.8/src/drivers/driver_wext.c	2009-02-15 19:00:00.000000000 +0100
-+++ BUILD2/wpa_supplicant-0.6.8/src/drivers/driver_wext.c	2009-03-06 10:29:08.000000000 +0100
-@@ -2055,19 +2055,26 @@
+Index: src/drivers/driver_wext.c
+===================================================================
+--- src/drivers/driver_wext.c.orig
++++ src/drivers/driver_wext.c
+@@ -1901,19 +1901,26 @@ int wpa_driver_wext_associate(void *priv
  	 * SIOCSIWENCODE here.
  	 */
  	if (drv->auth_alg_fallback &&
@@ -31,7 +32,7 @@ diff -ur BUILD/wpa_supplicant-0.6.8/src/drivers/driver_wext.c BUILD2/wpa_supplic
  	if (params->wpa_ie == NULL || params->wpa_ie_len == 0)
  		value = IW_AUTH_WPA_VERSION_DISABLED;
  	else if (params->wpa_ie[0] == WLAN_EID_RSN)
-@@ -2075,27 +2082,41 @@
+@@ -1921,27 +1928,41 @@ int wpa_driver_wext_associate(void *priv
  	else
  		value = IW_AUTH_WPA_VERSION_WPA;
  	if (wpa_driver_wext_set_auth_param(drv,
@@ -78,7 +79,7 @@ diff -ur BUILD/wpa_supplicant-0.6.8/src/drivers/driver_wext.c BUILD2/wpa_supplic
  
  	/* Allow unencrypted EAPOL messages even if pairwise keys are set when
  	 * not using WPA. IEEE 802.1X specifies that these frames are not
-@@ -2106,12 +2127,18 @@
+@@ -1952,12 +1973,18 @@ int wpa_driver_wext_associate(void *priv
  	else
  		allow_unencrypted_eapol = 1;
  
@@ -99,13 +100,13 @@ diff -ur BUILD/wpa_supplicant-0.6.8/src/drivers/driver_wext.c BUILD2/wpa_supplic
  #ifdef CONFIG_IEEE80211W
  	switch (params->mgmt_frame_protection) {
  	case NO_MGMT_FRAME_PROTECTION:
-@@ -2124,16 +2151,26 @@
+@@ -1970,17 +1997,25 @@ int wpa_driver_wext_associate(void *priv
  		value = IW_AUTH_MFP_REQUIRED;
  		break;
  	};
 -	if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_MFP, value) < 0)
 +	if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_MFP, value) < 0) {
-+		wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(IW_AUTH_MFP) failed", __FUNCTION__);
++	        wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(IW_AUTH_MFP) failed", __FUNCTION__);
  		ret = -1;
 +	}
  #endif /* CONFIG_IEEE80211W */
@@ -113,24 +114,23 @@ diff -ur BUILD/wpa_supplicant-0.6.8/src/drivers/driver_wext.c BUILD2/wpa_supplic
 +	if (params->freq && wpa_driver_wext_set_freq(drv, params->freq) < 0) {
 +		wpa_printf(MSG_DEBUG, "%s: assoc failed because set_freq failed", __FUNCTION__);
  		ret = -1;
--	if (wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0)
 +	}
-+
-+	if (wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0) {
+ 	if (!drv->cfg80211 &&
+-	    wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0)
++	    wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0) {
 +		wpa_printf(MSG_DEBUG, "%s: assoc failed because set_ssid failed", __FUNCTION__);
  		ret = -1;
 +	}
-+
  	if (params->bssid &&
 -	    wpa_driver_wext_set_bssid(drv, params->bssid) < 0)
 +	    wpa_driver_wext_set_bssid(drv, params->bssid) < 0) {
 +		wpa_printf(MSG_DEBUG, "%s: assoc failed because set_bssid failed", __FUNCTION__);
  		ret = -1;
 +	}
- 
- 	return ret;
- }
-@@ -2158,6 +2195,10 @@
+ 	if (drv->cfg80211 &&
+ 	    wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0)
+ 		ret = -1;
+@@ -2008,6 +2043,10 @@ static int wpa_driver_wext_set_auth_alg(
  	res = wpa_driver_wext_set_auth_param(drv, IW_AUTH_80211_AUTH_ALG,
  					     algs);
  	drv->auth_alg_fallback = res == -2;
diff --git a/wpa_supplicant-errormsg.patch b/wpa_supplicant-errormsg.patch
index 619abd4..0ac1b2a 100644
--- a/wpa_supplicant-errormsg.patch
+++ b/wpa_supplicant-errormsg.patch
@@ -1,6 +1,8 @@
---- BUILD/wpa_supplicant-0.6.4/src/drivers/driver_wext.c
-+++ BUILD/wpa_supplicant-0.6.4/src/drivers/driver_wext.c
-@@ -228,12 +228,13 @@
+Index: src/drivers/driver_wext.c
+===================================================================
+--- src/drivers/driver_wext.c.orig
++++ src/drivers/driver_wext.c
+@@ -54,12 +54,13 @@ int wpa_driver_wext_set_auth_param(struc
  	iwr.u.param.value = value;
  
  	if (ioctl(drv->ioctl_sock, SIOCSIWAUTH, &iwr) < 0) {
diff --git a/wpa_supplicant-flush-debug-output.patch b/wpa_supplicant-flush-debug-output.patch
index 27cb3d2..737f97c 100644
--- a/wpa_supplicant-flush-debug-output.patch
+++ b/wpa_supplicant-flush-debug-output.patch
@@ -1,7 +1,8 @@
-diff -ur BUILD/wpa_supplicant-0.6.3/src/utils/wpa_debug.c BUILD2/wpa_supplicant-0.6.3/src/utils/wpa_debug.c
---- BUILD/wpa_supplicant-0.6.3/src/utils/wpa_debug.c	2008-02-23 03:45:24.000000000 +0100
-+++ BUILD2/wpa_supplicant-0.6.3/src/utils/wpa_debug.c	2008-08-04 11:39:05.000000000 +0200
-@@ -39,6 +39,7 @@
+Index: src/utils/wpa_debug.c
+===================================================================
+--- src/utils/wpa_debug.c.orig
++++ src/utils/wpa_debug.c
+@@ -45,6 +45,7 @@ void wpa_debug_print_timestamp(void)
  	if (out_file) {
  		fprintf(out_file, "%ld.%06u: ", (long) tv.sec,
  			(unsigned int) tv.usec);
@@ -9,7 +10,7 @@ diff -ur BUILD/wpa_supplicant-0.6.3/src/utils/wpa_debug.c BUILD2/wpa_supplicant-
  	} else
  #endif /* CONFIG_DEBUG_FILE */
  	printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec);
-@@ -67,6 +68,7 @@
+@@ -111,6 +112,7 @@ void wpa_printf(int level, const char *f
  		if (out_file) {
  			vfprintf(out_file, fmt, ap);
  			fprintf(out_file, "\n");
@@ -17,7 +18,7 @@ diff -ur BUILD/wpa_supplicant-0.6.3/src/utils/wpa_debug.c BUILD2/wpa_supplicant-
  		} else {
  #endif /* CONFIG_DEBUG_FILE */
  		vprintf(fmt, ap);
-@@ -99,6 +101,7 @@
+@@ -146,6 +148,7 @@ static void _wpa_hexdump(int level, cons
  			fprintf(out_file, " [REMOVED]");
  		}
  		fprintf(out_file, "\n");
@@ -25,7 +26,7 @@ diff -ur BUILD/wpa_supplicant-0.6.3/src/utils/wpa_debug.c BUILD2/wpa_supplicant-
  	} else {
  #endif /* CONFIG_DEBUG_FILE */
  	printf("%s - hexdump(len=%lu):", title, (unsigned long) len);
-@@ -144,12 +147,14 @@
+@@ -191,12 +194,14 @@ static void _wpa_hexdump_ascii(int level
  			fprintf(out_file,
  				"%s - hexdump_ascii(len=%lu): [REMOVED]\n",
  				title, (unsigned long) len);
@@ -40,7 +41,7 @@ diff -ur BUILD/wpa_supplicant-0.6.3/src/utils/wpa_debug.c BUILD2/wpa_supplicant-
  			return;
  		}
  		fprintf(out_file, "%s - hexdump_ascii(len=%lu):\n",
-@@ -174,6 +179,7 @@
+@@ -221,6 +226,7 @@ static void _wpa_hexdump_ascii(int level
  			pos += llen;
  			len -= llen;
  		}
diff --git a/wpa_supplicant-sigusr1-changes-debuglevel.patch b/wpa_supplicant-sigusr1-changes-debuglevel.patch
index aeb6483..e46d5f6 100644
--- a/wpa_supplicant-sigusr1-changes-debuglevel.patch
+++ b/wpa_supplicant-sigusr1-changes-debuglevel.patch
@@ -1,7 +1,8 @@
-diff -ur BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c
---- BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c	2008-02-23 03:45:24.000000000 +0100
-+++ BUILD2/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c	2008-08-04 11:43:25.000000000 +0200
-@@ -133,6 +133,22 @@
+Index: wpa_supplicant/wpa_supplicant.c
+===================================================================
+--- wpa_supplicant/wpa_supplicant.c.orig
++++ wpa_supplicant/wpa_supplicant.c
+@@ -139,6 +139,22 @@ int wpa_set_wep_keys(struct wpa_supplica
  	return set;
  }
  
@@ -24,9 +25,9 @@ diff -ur BUILD/wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c BUILD2/wpa_s
  
  static int wpa_supplicant_set_wpa_none_key(struct wpa_supplicant *wpa_s,
  					   struct wpa_ssid *ssid)
-@@ -2016,6 +2032,8 @@
- 	eloop_register_signal_terminate(wpa_supplicant_terminate, NULL);
- 	eloop_register_signal_reconfig(wpa_supplicant_reconfig, NULL);
+@@ -2342,6 +2358,8 @@ int wpa_supplicant_run(struct wpa_global
+ 	eloop_register_signal_terminate(wpa_supplicant_terminate, global);
+ 	eloop_register_signal_reconfig(wpa_supplicant_reconfig, global);
  
 +	eloop_register_signal(SIGUSR1, wpa_supplicant_handle_sigusr1, NULL);
 +
diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes
index 156da4e..a34ed91 100644
--- a/wpa_supplicant.changes
+++ b/wpa_supplicant.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Jan 31 13:13:46 UTC 2010 - aj@suse.de
+
+- Update to 0.7.1 (full changelog in wpa_supplicant/ChangeLog):
+  * Cleanup of interfaces
+  * dbus: added new DBus interface (fi.w1.wpa_supplicant1)
+  * driver_nl80211: multiple updates to provide support for new Linux
+    nl80211/mac80211 functionality
+- Remove wpa_supplicant-dbus-iface-segfault-fix.patch, does not apply
+  at all.
+- Remove wpa_supplicant-dbus-reset-eapol.patch (merged upstream).
+- Disable patches that do not apply anymore but are not merged.
+
 -------------------------------------------------------------------
 Mon Sep 28 08:44:02 UTC 2009 - lnussel@suse.de
 
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index 30d8541..61d9d12 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package wpa_supplicant (Version 0.6.9)
+# spec file for package wpa_supplicant (Version 0.7.1)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,8 +21,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:        4
+Version:        0.7.1
+Release:        1
 License:        BSD3c(or similar) ; GPLv2+
 Group:          Productivity/Networking/Other
 Summary:        WPA supplicant implementation
@@ -38,9 +38,7 @@ Patch1:         wpa_supplicant-flush-debug-output.patch
 # wpa_supplicant-sigusr1-changes-debuglevel.patch won't go upstream as it
 # is not portable
 Patch2:         wpa_supplicant-sigusr1-changes-debuglevel.patch
-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
 # wpa_supplicant-roaming.patch won't go upstream as it is an ugly hack, once
@@ -79,18 +77,20 @@ Authors:
     Jouni Malinen <jkmaline@cc.hut.fi>
 
 %prep
-%setup -n wpa_supplicant-%{version}
+%setup -q -n wpa_supplicant-%{version}
+rm -rf wpa_supplicant-%{version}/patches
 cp %{SOURCE1} wpa_supplicant/.config
-%patch0 -p2
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
-%patch4 -p2
-%patch5 -p1
-%patch6 -p1
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch4 -p0
+# Patch does not apply anymore
+#%patch6 -p1
 #patch7 -p1
-%patch8 -p2
-%patch9 -p2
+# Patch does not apply anymore
+#%patch8 -p2
+# Patch does not apply anymore
+#%patch9 -p2
 
 %build
 cd wpa_supplicant
@@ -105,7 +105,7 @@ install -m 0755 wpa_supplicant/wpa_cli %{buildroot}%{_sbindir}
 install -m 0755 wpa_supplicant/wpa_passphrase %{buildroot}%{_sbindir}
 install -m 0755 wpa_supplicant/wpa_supplicant %{buildroot}%{_sbindir}
 install -d %{buildroot}%{_sysconfdir}/dbus-1/system.d
-install -m 0644 wpa_supplicant/dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
+install -m 0644 wpa_supplicant/dbus/dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
 install -d %{buildroot}/%{_sysconfdir}/%{name}
 install -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}
 install -d %{buildroot}/%{_datadir}/dbus-1/system-services
@@ -120,7 +120,7 @@ install -m 755 wpa_supplicant/wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir}
 
 %files
 %defattr(-,root,root)
-%doc wpa_supplicant/ChangeLog COPYING README wpa_supplicant/todo.txt wpa_supplicant/doc/wpa_supplicant.fig wpa_supplicant/examples wpa_supplicant/wpa_supplicant.conf
+%doc wpa_supplicant/ChangeLog COPYING README wpa_supplicant/todo.txt wpa_supplicant/examples wpa_supplicant/wpa_supplicant.conf
 %{_sbindir}/wpa_cli
 %{_sbindir}/wpa_passphrase
 %{_sbindir}/wpa_supplicant