diff --git a/BoardConfig.mk b/BoardConfig.mk
index 93748d5..f6b005d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -79,3 +79,4 @@ BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
 WPA_SUPPLICANT_VERSION := VER_0_8_X
+BOARD_KERNEL_CMDLINE += androidboot.wificountrycode=00
diff --git a/overlay/WifiRpiOverlay/res/values/config.xml b/overlay/WifiRpiOverlay/res/values/config.xml
index 8af944a..cb551c1 100644
--- a/overlay/WifiRpiOverlay/res/values/config.xml
+++ b/overlay/WifiRpiOverlay/res/values/config.xml
@@ -24,6 +24,9 @@
          is no longer indicative, and a separate config now exists for each band -->
     <bool translatable="false" name ="config_wifi5ghzSupport">true</bool>
 
+    <!-- Wifi driver supports IEEE80211AC for softap -->
+    <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>
+
     <!-- Do not translate. Default access point SSID used for tethering -->
     <string name="wifi_tether_configure_ssid_default" translatable="false">Raspberry Pi 4</string>