diff --git a/icwmp/Makefile b/icwmp/Makefile
index 98040392b..c91645ce7 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.1.23
+PKG_VERSION:=9.2.0
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=f0bb411fd1675110640946280fefe17ce6df5c09
+PKG_SOURCE_VERSION:=6f5852133a503e58747191ea1c7912436013dbbf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
diff --git a/icwmp/files/etc/config/cwmp b/icwmp/files/etc/config/cwmp
index bfa3989d8..ca20cb7bd 100644
--- a/icwmp/files/etc/config/cwmp
+++ b/icwmp/files/etc/config/cwmp
@@ -11,12 +11,11 @@ config acs 'acs'
 	option retry_min_wait_interval '5'
 	#­ possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
-	option ipv6_enable '0'
-	option ip_version '4'
 
 config cpe 'cpe'
 	option enable '1'
 	option default_wan_interface 'wan'
+	option default_wan6_interface 'wan6'
 	option default_lan_interface 'lan'
 	option log_to_console 'disable'
 	option log_to_file 'disable'
diff --git a/icwmp/files/etc/init.d/icwmpd b/icwmp/files/etc/init.d/icwmpd
index b622e6b2f..4fe00d181 100755
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -320,7 +320,6 @@ validate_acs_section()
 		'compression:or("GZIP","Deflate","Disabled")' \
 		'retry_min_wait_interval:range(1, 65535)' \
 		'retry_interval_multiplier:range(1000, 65535)' \
-		'ipv6_enable:bool' \
 		'ssl_capath:string'
 
 }
@@ -330,6 +329,7 @@ validate_cpe_section()
 	uci_validate_section cwmp cpe "cpe" \
 		'interface:string' \
 		'default_wan_interface:string' \
+		'default_wan6_interface:string' \
 		'log_to_console:or("enable","disable")' \
 		'log_to_file:or("enable","disable")' \
 		'log_severity:or("EMERG", "ALERT", "CRITIC" ,"ERROR", "WARNING", "NOTICE", "INFO", "DEBUG")' \
@@ -382,12 +382,15 @@ boot() {
 
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
+	local wan_interface=""
+	
+	config_get wan_interface cpe default_wan_interface "wan"
+	
 	if [ "$enable_cwmp" = "0" ]; then
 		return 0
 	fi
 
 	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get wan_interface cpe default_wan_interface "wan"
 
 	if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then
 		# Set dhcp option 43 if not already configured