diff --git a/icwmp/Config.in b/icwmp/Config.in
index 01e000923..c71358243 100644
--- a/icwmp/Config.in
+++ b/icwmp/Config.in
@@ -15,4 +15,8 @@ config ICWMP_ENABLE_VENDOR_EXTN
 config ICWMP_VENDOR_PREFIX
 	string "Package specific datamodel Vendor Prefix for TR181 extensions"
 	default ""
+
+config ICWMP_ENABLE_SMM_SUPPORT
+	bool "Enable software module management support"
+	default n
 endmenu
diff --git a/icwmp/Makefile b/icwmp/Makefile
index 9d5447faf..0f7cdb868 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.9.4
+PKG_VERSION:=9.9.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=e0fde6e9134afcf3ddd307ff13f4891e189cd6ea
+PKG_SOURCE_VERSION:=4339ef5be002e85e2bae70a6c2a6af8605d9f586
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -56,6 +56,10 @@ ifeq ($(CONFIG_ICWMP_ENABLE_VENDOR_EXTN),y)
 EXTRA_CFLAGS += -DICWMP_ENABLE_VENDOR_EXTN
 endif
 
+ifeq ($(CONFIG_ICWMP_ENABLE_SMM_SUPPORT),y)
+EXTRA_CFLAGS += -DICWMP_ENABLE_SMM_SUPPORT
+endif
+
 ifeq ($(CONFIG_ICWMP_VENDOR_PREFIX),"")
 CMAKE_OPTIONS += -DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)"
 else