diff --git a/Kbuild b/Kbuild
index fd20c6559398..bdfbf96076ab 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1258,6 +1258,9 @@ REGULATORY_OBJS := $(REG_CORE_OBJ_DIR)/reg_db.o \
                    $(REG_DISPATCHER_OBJ_DIR)/wlan_reg_services_api.o \
                    $(REG_DISPATCHER_OBJ_DIR)/wlan_reg_tgt_api.o \
                    $(REG_DISPATCHER_OBJ_DIR)/wlan_reg_ucfg_api.o
+ifeq ($(CONFIG_HOST_11D_SCAN), y)
+REGULATORY_OBJS += $(REG_CORE_OBJ_DIR)/reg_host_11d.o
+endif
 
 ############## Control path common scheduler ##########
 SCHEDULER_DIR := scheduler
@@ -2176,6 +2179,9 @@ cppflags-$(CONFIG_CRYPTO_COMPONENT) += -DWLAN_CONV_CRYPTO_SUPPORTED \
                                        -DWLAN_CRYPTO_FILS_OS_DERIVATIVE \
                                        -DWLAN_CRYPTO_OMAC1_OS_DERIVATIVE
 
+#Enable host 11d scan
+cppflags-$(CONFIG_HOST_11D_SCAN) += -DHOST_11D_SCAN
+
 #Stats & Quota Metering feature
 ifeq ($(CONFIG_IPA_OFFLOAD), y)
 ifeq ($(CONFIG_QCACLD_FEATURE_METERING), y)
diff --git a/configs/genoa.common b/configs/genoa.common
index bbca03164f5c..fb1a63f902ef 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -52,6 +52,7 @@ CONFIG_WLAN_DYNAMIC_CVM := n
 
 #We might need to disable WEXT support in perf builds in future
 CONFIG_WLAN_WEXT_SUPPORT_ENABLE := y
+CONFIG_HOST_11D_SCAN := y
 
 ifeq ($(CONFIG_ARCH_MSM8996), y)
 CONFIG_CHANNEL_HOPPING_ALL_BANDS := y