diff --git a/icwmp/Makefile b/icwmp/Makefile
index cd0200e98..b90dfa093 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.40
+PKG_VERSION:=9.8.41
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -72,6 +72,7 @@ define Package/icwmp/install
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/95-migrate-gw-info $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/icwmpd/vendor_log.sh $(1)/etc/icwmpd/vendor_log.sh
 	$(INSTALL_BIN) ./files/etc/icwmpd/firewall.cwmp $(1)/etc/icwmpd/firewall.cwmp
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
diff --git a/icwmp/files/etc/config/cwmp b/icwmp/files/etc/config/cwmp
index f7087d875..6263b86ac 100644
--- a/icwmp/files/etc/config/cwmp
+++ b/icwmp/files/etc/config/cwmp
@@ -42,7 +42,6 @@ config cpe 'cpe'
 	option periodic_notify_interval '10'
 	option incoming_rule 'Port_Only'
 	option active_notif_throttle '0'
-	option disable_gatewayinfo '0'
 	option fw_upgrade_keep_settings '1'
 	option clock_sync_timeout '128'
 	option disable_datatype_check '0'
diff --git a/icwmp/files/etc/uci-defaults/95-migrate-gw-info b/icwmp/files/etc/uci-defaults/95-migrate-gw-info
new file mode 100644
index 000000000..745540fa6
--- /dev/null
+++ b/icwmp/files/etc/uci-defaults/95-migrate-gw-info
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Script to migrate gateway-info options to gateway uci
+if [ ! -f "/etc/config/cwmp" ] && [ ! -f "/etc/config/gateway" ]; then
+	exit 0
+fi
+
+val="$(uci -q get cwmp.cpe.disable_gatewayinfo)"
+
+if [ "$val" -eq 1 ]; then
+	uci -q set gateway.global.enable=0
+fi
+
+uci -q set cwmp.cpe.disable_gatewayinfo=""