diff --git a/icwmp/Config_cwmp.in b/icwmp/Config_cwmp.in
old mode 100755
new mode 100644
diff --git a/icwmp/Config_datamodel.in b/icwmp/Config_datamodel.in
old mode 100755
new mode 100644
diff --git a/icwmp/Makefile b/icwmp/Makefile
old mode 100755
new mode 100644
index 962e32ffe..aaac82f7d
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -22,7 +22,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
 	CONFIG_CWMP_ACS_HDM \
 	CONFIG_CWMP_DEBUG \
-	CONFIG_CWMP_DEVEL_DEBUG
+	CONFIG_CWMP_DEVEL_DEBUG 
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -37,6 +37,12 @@ define Package/libdatamodel
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef
 
+define Package/icwmp_stun
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 stun Client
+	DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
+endef
 
 define Package/icwmp/Default
   SECTION:=utils
@@ -172,6 +178,15 @@ endif
 	$(CP) ./files/* $(1)/
 endef
 
+define Package/icwmp_stun/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_stund $(1)/usr/sbin/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_stund $(1)/etc/init.d/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/icwmp_stun $(1)/etc/config
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
@@ -205,4 +220,5 @@ endef
 
 $(eval $(call BuildPackage,icwmp-curl))
 $(eval $(call BuildPackage,libdatamodel))
+$(eval $(call BuildPackage,icwmp_stun))
 $(eval $(call BuildPackage,icwmp-zstream))