diff --git a/package/qca/nss/qca-mcs/Makefile b/package/qca/nss/qca-mcs/Makefile
new file mode 100644
index 000000000..16129092e
--- /dev/null
+++ b/package/qca/nss/qca-mcs/Makefile
@@ -0,0 +1,55 @@
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=qca-mcs
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/qca-mcs
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=31f5cd4b83da5a7c0fdca240b4e72677e4523b6e
+PKG_MIRROR_HASH:=1b6997793b51cbeed9520d3183787aaf5ce283cf87ef6603c24cc342654dde61
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/qca-mcs
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Support
+  URL:=http://www.qca.qualcomm.com
+  MAINTAINER:=Qualcomm Atheros, Inc.
+  TITLE:=QCA Multicast Snooping Support
+  DEPENDS:=
+  KCONFIG:=CONFIG_NETFILTER=y CONFIG_BRIDGE_NETFILTER=y
+  FILES:=$(PKG_BUILD_DIR)/qca-mcs.ko
+  AUTOLOAD:=$(call AutoLoad,41,qca-mcs)
+endef
+
+define KernelPackage/qca-mcs/description
+  This package installs the IGMP/MLD Snooping Module
+endef
+
+QCA_MC_SNOOPING_HEADERS= \
+            $(PKG_BUILD_DIR)/mc_api.h \
+            $(PKG_BUILD_DIR)/mc_ecm.h \
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/qca-mcs
+	$(foreach header_file,$(QCA_MC_SNOOPING_HEADERS), $(CP) $(header_file) $(1)/usr/include/qca-mcs;)
+	$(foreach header_file,$(QCA_MC_SNOOPING_HEADERS), $(CP) $(header_file) $(1)/usr/include/;)
+endef
+
+QCA_MC_SNOOPING_MAKE_OPTS:= \
+	MC_SUPPORT_MLD=1
+
+define Build/Compile
+	$(MAKE) $(PKG_JOBS) -C $(LINUX_DIR) \
+		$(KERNEL_MAKE_FLAGS) \
+		KBUILDPATH=$(LINUX_DIR) \
+		$(PKG_MAKE_FLAGS) \
+		M=$(PKG_BUILD_DIR) \
+		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+		$(strip $(QCA_MC_SNOOPING_MAKE_OPTS)) \
+		modules
+endef
+
+$(eval $(call KernelPackage,qca-mcs))
diff --git a/package/qca/nss/qca-mcs/patches/101-revert-to-old-build-logic.patch b/package/qca/nss/qca-mcs/patches/101-revert-to-old-build-logic.patch
new file mode 100644
index 000000000..f35e78b5c
--- /dev/null
+++ b/package/qca/nss/qca-mcs/patches/101-revert-to-old-build-logic.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -32,7 +32,9 @@ ccflags-y += -I$(CURDIR) \
+ 	     -I$(KBUILDPATH)/include/asm \
+ 	     -I$(KBUILDPATH)/net/bridge
+ 
+-ccflags-$(CONFIG_SUPPORT_MLD) += -DMC_SUPPORT_MLD
++ifeq ($(strip ${MC_SUPPORT_MLD}),1)
++ccflags-y+=-DMC_SUPPORT_MLD
++endif
+ 
+ # Module extra compilation flags
+ ccflags-y += -Werror -Wall -g