diff --git a/icwmp/Makefile b/icwmp/Makefile
index 5327b92bf..ae4add55e 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.25.6
+PKG_VERSION:=8.4.25.7
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
@@ -22,11 +22,6 @@ PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_FIXUP:=autoreconf
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_CWMP_ACS_MULTI \
-	CONFIG_CWMP_ACS_HDM \
-	CONFIG_CWMP_DEBUG \
-	CONFIG_CWMP_DEVEL_DEBUG
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -42,12 +37,6 @@ TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
 
-define Package/icwmp
-  $(Package/icwmp/default)
-  TITLE += (internal)
-  VARIANT:=internal
-endef
-
 define Package/icwmp-openssl
   $(Package/icwmp/default)
   TITLE += (openssl)
@@ -114,7 +103,6 @@ Package/icwmp-openssl/install = $(Package/icwmp/default/install)
 Package/icwmp-wolfssl/install = $(Package/icwmp/default/install)
 Package/icwmp-mbedtls/install = $(Package/icwmp/default/install)
 
-$(eval $(call BuildPackage,icwmp))
 $(eval $(call BuildPackage,icwmp-openssl))
 $(eval $(call BuildPackage,icwmp-wolfssl))
 $(eval $(call BuildPackage,icwmp-mbedtls))
diff --git a/icwmp/files/etc/init.d/icwmpd b/icwmp/files/etc/init.d/icwmpd
index 869cde7b6..d4f17828e 100755
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -77,7 +77,7 @@ convert_to_hex() {
 	OPTIND=1
 	while getopts ":" opt "-$optval"
 	do
-		temp=$(printf "%X" "'${OPTARG:-:}")
+		temp=$(printf "%02X" "'${OPTARG:-:}")
 		val="${val}:${temp}"
 	done
 
@@ -133,14 +133,14 @@ configure_send_op125() {
 		opt125_len=$((opt125_len + 4))
 	fi
 
-	hex_opt125_len=$(printf "%X" "${opt125_len}")
+	hex_opt125_len=$(printf "%02X" "${opt125_len}")
 	opt125="${opt125}:${hex_opt125_len}"
 	hex_oui=$(convert_to_hex "${oui}")
 	if [ -z "${hex_oui}" ]; then
 		return 0
 	fi
 
-	hex_oui_len=$(printf "%X" "${oui_len}")
+	hex_oui_len=$(printf "%02X" "${oui_len}")
 	if [ "${uci}" = "network" ]; then
 		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
 	else
@@ -152,7 +152,7 @@ configure_send_op125() {
 		return 0
 	fi
 
-	hex_serial_len=$(printf "%X" "${serial_len}")
+	hex_serial_len=$(printf "%02X" "${serial_len}")
 	if [ "${uci}" = "network" ]; then
 		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
 	else
@@ -165,7 +165,7 @@ configure_send_op125() {
 			return 0
 		fi
 
-		hex_class_len=$(printf "%X" "${class_len}")
+		hex_class_len=$(printf "%02X" "${class_len}")
 		if [ "${uci}" = "network" ]; then
 			opt125="${opt125}:03:${hex_class_len}${hex_class}"
 		else