diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 79493e35f..fbc85b624 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -259,6 +259,10 @@ NEED_ECC=y
 endif
 endif
 
+ifdef CONFIG_MBO
+CONFIG_WNM=y
+endif
+
 ifdef CONFIG_WNM
 L_CFLAGS += -DCONFIG_WNM
 OBJS += wnm_sta.c
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 95bb52d38..1f36ae787 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -292,6 +292,10 @@ NEED_ECC=y
 endif
 endif
 
+ifdef CONFIG_MBO
+CONFIG_WNM=y
+endif
+
 ifdef CONFIG_WNM
 CFLAGS += -DCONFIG_WNM
 OBJS += wnm_sta.o