diff --git a/bcm4329/config/Android.mk b/bcm4329/config/Android.mk
index 382bd73..9597016 100644
--- a/bcm4329/config/Android.mk
+++ b/bcm4329/config/Android.mk
@@ -28,6 +28,10 @@
 #########################
 
 WIFI_DRIVER_SOCKET_IFACE := eth0
-include external/wpa_supplicant/wpa_supplicant_conf.mk
+ifeq ($(strip $(WPA_SUPPLICANT_VERSION)),VER_0_6_X)
+  include external/wpa_supplicant_6/wpa_supplicant/wpa_supplicant_conf.mk
+else
+  include external/wpa_supplicant/wpa_supplicant_conf.mk
+endif
 
 #######################