diff --git a/Kbuild b/Kbuild
index fadee94c543d1..34abda0fda2c9 100644
--- a/Kbuild
+++ b/Kbuild
@@ -164,6 +164,8 @@ ifeq ($(KERNEL_BUILD), 0)
 
 	CONFIG_MPC_UT_FRAMEWORK := y
 
+	CONFIG_FEATURE_EPPING := y
+
 	#Flag to enable offload packets feature
 	CONFIG_WLAN_OFFLOAD_PACKETS := y
 
@@ -1671,7 +1673,6 @@ INCS +=		$(UMAC_SPECTRAL_INC)
 INCS +=		$(UMAC_TARGET_SPECTRAL_INC)
 
 OBJS :=		$(HDD_OBJS) \
-		$(EPPING_OBJS) \
 		$(MAC_OBJS) \
 		$(SAP_OBJS) \
 		$(SME_OBJS) \
@@ -1703,6 +1704,11 @@ ifeq ($(CONFIG_LITHIUM), y)
 OBJS += 	$(HAL_OBJS)
 endif
 
+ifeq ($(CONFIG_FEATURE_EPPING), y)
+OBJS += 	$(EPPING_OBJS)
+endif
+
+
 OBJS +=		$(UMAC_OBJMGR_OBJS)
 OBJS +=		$(WIFI_POS_OBJS)
 OBJS +=		$(WLAN_NAN_OBJS)
@@ -2347,6 +2353,10 @@ ifeq ($(CONFIG_MPC_UT_FRAMEWORK), y)
 CDEFINES += -DMPC_UT_FRAMEWORK
 endif
 
+ifeq ($(CONFIG_FEATURE_EPPING), y)
+CDEFINES += -DWLAN_FEATURE_EPPING
+endif
+
 ifeq ($(CONFIG_WLAN_OFFLOAD_PACKETS),y)
 CDEFINES += -DWLAN_FEATURE_OFFLOAD_PACKETS
 endif