diff --git a/icwmp/Config.in b/icwmp/Config.in
index 72f46a1c2..e5e19aa82 100644
--- a/icwmp/Config.in
+++ b/icwmp/Config.in
@@ -20,6 +20,10 @@ config ICWMP_ENABLE_SMM_SUPPORT
 	bool "Enable software module management support"
 	default n
 
+config ICWMP_ENABLE_OPCONF_SUPPORT
+	bool "Enable support for managing Operator Configuration via CWMP"
+	default y
+
 config ICWMP_ENABLE_ANNEX_F_INFORM_PARAM
 	bool "Enable Device.Gateway. and Device.ManagementServer.ManageableDevice. as inform parameter"
 	default y
diff --git a/icwmp/Makefile b/icwmp/Makefile
index bdb9f18ef..f99d5da62 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.11.2
+PKG_VERSION:=9.11.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=ea78dfdd2abf14250e7899d1ac37d5e5256fb65d
+PKG_SOURCE_VERSION:=588f8803e490aaf59dfb305d8cfd765e41348924
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.zst
 PKG_MIRROR_HASH:=skip
 endif
@@ -60,6 +60,10 @@ ifeq ($(CONFIG_ICWMP_ENABLE_SMM_SUPPORT),y)
 EXTRA_CFLAGS += -DICWMP_ENABLE_SMM_SUPPORT
 endif
 
+ifeq ($(CONFIG_ICWMP_ENABLE_OPCONF_SUPPORT),y)
+EXTRA_CFLAGS += -DICWMP_ENABLE_OPCONF_SUPPORT
+endif
+
 ifeq ($(CONFIG_ICWMP_VENDOR_PREFIX),"")
 CMAKE_OPTIONS += -DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)"
 else