diff --git a/components/wpa_supplicant/Kconfig b/components/wpa_supplicant/Kconfig
new file mode 100644
index 0000000000..21175c963a
--- /dev/null
+++ b/components/wpa_supplicant/Kconfig
@@ -0,0 +1,21 @@
+menu "Supplicant"
+
+    config WPA_WPS_WARS
+        bool "Enable WPS Inter operatability Fixes"
+        default n
+        help
+            Select this option to enable WPS related IOT fixes with different
+            APs. This option fixes IOT related issues with APs which do not
+            follow some of the standard of WPS-2.0 specification. However
+            these do not include any of the security related bypassing, just
+            simple configuration corrections. Current fixes under this flag:
+            1. Allow NULL-padded WPS attributes: Some APs keep NULL-padding
+            at the end of some variable length WPS Attributes. This is not
+            as par the WPS2.0 specs, but to avoid interop issues, ignore the
+            padding by reducing the attribute length by 1.
+            2. Bypass WPS-Config method validation: Some APs set display/pbc
+            button bit without setting virtual/phycial display/button bit
+            which will cause M2 validation fail, bypassing WPS-Config method
+            validation.
+
+endmenu
diff --git a/components/wpa_supplicant/src/wps/wps_attr_parse.c b/components/wpa_supplicant/src/wps/wps_attr_parse.c
index 59f85d709d..95ec4234df 100644
--- a/components/wpa_supplicant/src/wps/wps_attr_parse.c
+++ b/components/wpa_supplicant/src/wps/wps_attr_parse.c
@@ -132,6 +132,7 @@ static u16 wps_ignore_null_padding_in_attr(const u8 *pos, u16 type, u16 attr_dat
 {
 	u16 len = attr_data_len;
 
+#ifdef CONFIG_WPA_WPS_WARS
 	if (len == 0)
 		return 0;
 	/*
@@ -153,6 +154,7 @@ static u16 wps_ignore_null_padding_in_attr(const u8 *pos, u16 type, u16 attr_dat
 		default:
 			break;
 	}
+#endif
 
 	return len;
 }
diff --git a/components/wpa_supplicant/src/wps/wps_validate.c b/components/wpa_supplicant/src/wps/wps_validate.c
index 8fdfc33036..f02e2fa18f 100644
--- a/components/wpa_supplicant/src/wps/wps_validate.c
+++ b/components/wpa_supplicant/src/wps/wps_validate.c
@@ -95,6 +95,7 @@ static int wps_validate_response_type(const u8 *response_type, int mandatory)
 
 static int valid_config_methods(u16 val, int wps2)
 {
+#ifndef CONFIG_WPA_WPS_WARS
 	if (wps2) {
 		if (!(val & 0x6000) && (val & WPS_CONFIG_DISPLAY)) {
 			wpa_printf(MSG_INFO, "WPS-STRICT: Display flag "
@@ -108,6 +109,7 @@ static int valid_config_methods(u16 val, int wps2)
 		}
 	}
 
+#endif
 	return 1;
 }