diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config
index ef5a8d1fb..2ad04318a 100644
--- a/wpa_supplicant/android.config
+++ b/wpa_supplicant/android.config
@@ -509,8 +509,14 @@ CONFIG_AP=y
 # more information on P2P operations.
 CONFIG_P2P=y
 
+# Enable TDLS support
 CONFIG_TDLS=y
 
+# Wi-Fi Direct
+# This can be used to enable Wi-Fi Direct extensions for P2P using an external
+# program to control the additional information exchanges in the messages.
+CONFIG_WIFI_DISPLAY=y
+
 # Autoscan
 # This can be used to enable automatic scan support in wpa_supplicant.
 # See wpa_supplicant.conf for more information on autoscan usage.
diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig
index 8ccff887d..ea0db04fc 100644
--- a/wpa_supplicant/defconfig
+++ b/wpa_supplicant/defconfig
@@ -518,6 +518,11 @@ CONFIG_PEERKEY=y
 # Enable TDLS support
 #CONFIG_TDLS=y
 
+# Wi-Fi Direct
+# This can be used to enable Wi-Fi Direct extensions for P2P using an external
+# program to control the additional information exchanges in the messages.
+#CONFIG_WIFI_DISPLAY=y
+
 # Autoscan
 # This can be used to enable automatic scan support in wpa_supplicant.
 # See wpa_supplicant.conf for more information on autoscan usage.