diff --git a/icwmp/Makefile b/icwmp/Makefile
index c7240dd2b..696723941 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.8.35
+PKG_VERSION:=9.8.36
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=fb2269b315b296227811de81298b995e4d20aba2
+PKG_SOURCE_VERSION:=7c5e02a81d88b78da1394b0729e93cf3313b293d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
diff --git a/icwmp/files/lib/upgrade/keep.d/icwmp b/icwmp/files/lib/upgrade/keep.d/icwmp
index 788b0a136..05f623980 100644
--- a/icwmp/files/lib/upgrade/keep.d/icwmp
+++ b/icwmp/files/lib/upgrade/keep.d/icwmp
@@ -1,2 +1,2 @@
-/var/run/icwmpd/icwmpd_backup_session.xml
+/etc/icwmpd/icwmpd_backup_session.xml
 /etc/icwmpd/cwmp