diff --git a/packages/network/wpa_supplicant/build b/packages/network/wpa_supplicant/build
index 0679c9fe67..0606b143ca 100755
--- a/packages/network/wpa_supplicant/build
+++ b/packages/network/wpa_supplicant/build
@@ -25,6 +25,9 @@
 cd $PKG_BUILD/$1
 
 cp $ROOT/$PKG_DIR/config/makefile.config .config
+
+echo "CONFIG_TLS=gnutls" >> .config
+echo "CONFIG_GNUTLS_EXTRA=y" >> .config
 [ "$DEBUG" = "no" ] && echo "CONFIG_NO_STDOUT_DEBUG=y" >> .config
 
 make
diff --git a/packages/network/wpa_supplicant/config/makefile.config b/packages/network/wpa_supplicant/config/makefile.config
index d4030474d4..9757389238 100644
--- a/packages/network/wpa_supplicant/config/makefile.config
+++ b/packages/network/wpa_supplicant/config/makefile.config
@@ -1,5 +1,5 @@
 CONFIG_WPS=y
-CONFIG_CTRL_IFACE=y
+CONFIG_CTRL_IFACE=unix
 CONFIG_CTRL_IFACE_DBUS=y
 CONFIG_CTRL_IFACE_DBUS_NEW=y
 CONFIG_CTRL_IFACE_DBUS_INTRO=y
@@ -8,11 +8,13 @@ CONFIG_CTRL_IFACE_DBUS_INTRO=y
 //CONFIG_DRIVER_MADWIFI=y
 CONFIG_DRIVER_ATMEL=y
 CONFIG_DRIVER_WEXT=y
-CONFIG_DRIVER_NDISWRAPPER=y
+//CONFIG_DRIVER_NDISWRAPPER=y
 //CONFIG_DRIVER_PRISM54=y
 CONFIG_DRIVER_WIRED=y
 //CONFIG_DRIVER_BROADCOM=y
 //CONFIG_DRIVER_IPW=y
+CONFIG_DRIVER_RALINK=y
+CONFIG_DRIVER_NL80211=y
 //CONFIG_DRIVER_BSD=y
 //CONFIG_DRIVER_NDIS=y
 CONFIG_WIRELESS_EXTENSION=y
@@ -22,10 +24,11 @@ CONFIG_EAP_MSCHAPV2=y
 CONFIG_EAP_TLS=y
 CONFIG_EAP_PEAP=y
 CONFIG_EAP_TTLS=y
+CONFIG_EAP_FAST=y
 CONFIG_EAP_GTC=y
 CONFIG_EAP_OTP=y
-CONFIG_EAP_SIM=y
-CONFIG_EAP_AKA=y
+//CONFIG_EAP_SIM=y
+//CONFIG_EAP_AKA=y
 CONFIG_EAP_PSK=y
 CONFIG_EAP_PAX=y
 CONFIG_EAP_LEAP=y
@@ -33,7 +36,3 @@ CONFIG_EAP_LEAP=y
 CONFIG_PKCS12=y
 CONFIG_SMARTCARD=y
 CONFIG_DEBUG_FILE=y
-CONFIG_DRIVER_NL80211=y
-
-CONFIG_TLS=gnutls
-CONFIG_GNUTLS_EXTRA=y
diff --git a/packages/network/wpa_supplicant/install b/packages/network/wpa_supplicant/install
index 5f50fb5a7c..eee9a7ca29 100755
--- a/packages/network/wpa_supplicant/install
+++ b/packages/network/wpa_supplicant/install
@@ -22,9 +22,15 @@
 
 . config/options $1
 
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/wpa_supplicant/wpa_cli $INSTALL/usr/bin
+
 mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/wpa_supplicant/dbus/dbus-wpa_supplicant.conf $INSTALL/etc/dbus-1/system.d
 
+mkdir -p $INSTALL/etc/pm/sleep.d
+     cp $PKG_BUILD/wpa_supplicant/examples/sleep.d/60_wpa_supplicant $INSTALL/etc/pm/sleep.d
+
 mkdir -p $INSTALL/sbin
   cp $PKG_BUILD/wpa_supplicant/wpa_supplicant $INSTALL/sbin
   cp $PKG_BUILD/wpa_supplicant/wpa_passphrase $INSTALL/sbin
diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-0.7.3-bcm_custom_event.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-0.7.3-bcm_custom_event.patch
deleted file mode 100644
index 0a94341180..0000000000
--- a/packages/network/wpa_supplicant/patches/wpa_supplicant-0.7.3-bcm_custom_event.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/src/drivers/driver.h b/src/drivers/driver.h
-index fa49da4..511f613 100644
---- a/src/drivers/driver.h
-+++ b/src/drivers/driver.h
-@@ -2046,7 +2046,15 @@ enum wpa_event_type {
- 	 * observed in frames received from the current AP if signal strength
- 	 * monitoring has been enabled with signal_monitor().
- 	 */
--	EVENT_SIGNAL_CHANGE
-+	EVENT_SIGNAL_CHANGE,
-+
-+	/**
-+	 * EVENT_BROADCOM_CUSTOM - Broadcom custom event
-+	 *
-+	 * This event is sent when failing to associate while running the
-+	 * initial scan.
-+	 */
-+	EVENT_BROADCOM_CUSTOM
- };
- 
- 
-diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
-index 2614f23..04094ee 100644
---- a/src/drivers/driver_wext.c
-+++ b/src/drivers/driver_wext.c
-@@ -299,6 +299,9 @@ wpa_driver_wext_event_wireless_custom(void *ctx, char *custom)
- 		}
- 		wpa_supplicant_event(ctx, EVENT_STKSTART, &data);
- #endif /* CONFIG_PEERKEY */
-+	} else if (os_strncmp(custom, "Conn NoNetworks", 15) == 0) {
-+		wpa_printf(MSG_DEBUG, "WEXT: Broadcom custom event");
-+		wpa_supplicant_event(ctx, EVENT_BROADCOM_CUSTOM, &data);
- 	}
- }
- 
-diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
-index 2f3a303..c2fc28a 100644
---- a/wpa_supplicant/events.c
-+++ b/wpa_supplicant/events.c
-@@ -1726,6 +1726,15 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
- 		bgscan_notify_signal_change(
- 			wpa_s, data->signal_change.above_threshold);
- 		break;
-+	case EVENT_BROADCOM_CUSTOM:
-+		wpa_printf(MSG_DEBUG, "Broadcom event in state %d",
-+			   wpa_s->wpa_state);
-+		if (wpa_s->wpa_state == WPA_SCANNING) {
-+			/* Force scanning */
-+			wpa_s->scan_req = 1;
-+			wpa_supplicant_req_scan(wpa_s, 0, 0);
-+		}
-+		break;
- 	default:
- 		wpa_printf(MSG_INFO, "Unknown event %d", event);
- 		break;