diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index a2772c2..bf9bb6a 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -32,7 +32,7 @@
 INCLUDES += external/openssl/include
 INCLUDES += frameworks/base/cmds/keystore
 ifdef CONFIG_DRIVER_NL80211
-INCLUDES += external/libnl_2/include
+INCLUDES += system/core/libnl_2/include
 endif
 
 
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index fffb1f8..6cbfe8e 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -66,7 +66,7 @@
 INCLUDES += external/openssl/include
 INCLUDES += frameworks/base/cmds/keystore
 ifdef CONFIG_DRIVER_NL80211
-INCLUDES += external/libnl_2/include
+INCLUDES += system/core/libnl_2/include
 endif
 
 OBJS = config.c
@@ -1045,7 +1045,9 @@
 SHA1OBJS += src/crypto/fips_prf_internal.c
 endif
 endif
-ifndef CONFIG_NO_WPA_PASSPHRASE
+ifdef CONFIG_NO_WPA_PASSPHRASE
+L_CFLAGS += -DCONFIG_NO_PBKDF2
+else
 SHA1OBJS += src/crypto/sha1-pbkdf2.c
 endif
 ifdef NEED_T_PRF
@@ -1173,6 +1175,9 @@
 ifdef CONFIG_WPS
 DBUS_OBJS += dbus/dbus_new_handlers_wps.c
 endif
+ifdef CONFIG_P2P
+DBUS_OBJS += dbus/dbus_new_handlers_p2p.c
+endif
 ifndef DBUS_LIBS
 DBUS_LIBS := $(shell pkg-config --libs dbus-1)
 endif
@@ -1262,6 +1267,9 @@
 
 ifdef CONFIG_DEBUG_SYSLOG
 L_CFLAGS += -DCONFIG_DEBUG_SYSLOG
+ifdef CONFIG_DEBUG_SYSLOG_FACILITY
+L_CFLAGS += -DLOG_HOSTAPD="$(CONFIG_DEBUG_SYSLOG_FACILITY)"
+endif
 endif
 
 ifdef CONFIG_DEBUG_FILE