diff --git a/libscapi/Makefile b/libscapi/Makefile
index 23d9cba..527c6ce 100644
--- a/libscapi/Makefile
+++ b/libscapi/Makefile
@@ -13,8 +13,8 @@ include $(INCLUDE_DIR)/kernel.mk
 
 #### Package Info ############################### 
 PKG_NAME:=libscapi
-PKG_VERSION:=1.5.1.4
-PKG_SOURCE_VERSION:=80c6f167adf70f0c28b22f0cfe4265cbb3df0408
+PKG_VERSION:=2.6.0.24
+PKG_SOURCE_VERSION:=43efc06e5920d0fb386f75876f77ff6c0b74f8a0
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/$(PKG_NAME).git
 PKG_LICENSE:=LGPL-2.1-only
@@ -33,7 +33,7 @@ define Package/$(PKG_NAME)
   TITLE:=UGW Framework System Configuration APIs
   URL:=http://www.intel.com
   MAINTAINER:=Intel Corporation
-  DEPENDS:= +libhelper
+  DEPENDS:= +libhelper +safeclibs3
   MENU:=1
 endef
 
@@ -54,7 +54,7 @@ endef
 #export $(PKG_CONFIG_DEPENDS)
 
 ifeq ($(CONFIG_USE_MUSL),y)
-  TARGET_CFLAGS += -DCONFIG_USE_MUSL
+  TARGET_CFLAGS += -DCONFIG_USE_MUSL -DHAVE_C99=1
 endif
 
 #### Target Rules ###############################
diff --git a/libscapi/files/scapi_utils.sh b/libscapi/files/scapi_utils.sh
index e0aedb0..8e8570e 100755
--- a/libscapi/files/scapi_utils.sh
+++ b/libscapi/files/scapi_utils.sh
@@ -1,30 +1,36 @@
 #!/bin/sh 
 
-. /etc/profile.d/ugw_framework_env.sh
+if [ -f /etc/profile.d/ugw_framework_env.sh ] ; then
+	. /etc/profile.d/ugw_framework_env.sh
+fi
+
+if [ -f /etc/profile.d/intel.sh ] ; then
+	. /etc/profile.d/intel.sh
+fi
 
 scapi_utils_init()
 {
 	local file="${VENDOR_PATH}/etc/.certchk"
-	local fwfile="${VENDOR_PATH}/etc/csd/fwboot"
+	#local fwfile="${VENDOR_PATH}/etc/csd/fwboot"
 
-	local cmd_line t_active_bank active_bank t_update_chk update_chk
-	cmd_line="`cat /proc/cmdline`";
+	#local cmd_line t_active_bank active_bank t_update_chk update_chk
+	#cmd_line="`cat /proc/cmdline`";
 
-	[ -z "${cmd_line##*active_bank=[AB]*}" ] && {
-		t_active_bank=${cmd_line##*active_bank=};
-		active_bank=${t_active_bank::1};
-	} || active_bank=A;
+	#[ -z "${cmd_line##*active_bank=[AB]*}" ] && {
+	#	t_active_bank=${cmd_line##*active_bank=};
+	#	active_bank=${t_active_bank::1};
+	#} || active_bank=A;
 
-	[ -z "${cmd_line##*update_chk=[0-4]*}" ] && {
-		t_update_chk=${cmd_line##*update_chk=};
-		update_chk=${t_update_chk::1};
-	} || update_chk=0;
+	#[ -z "${cmd_line##*update_chk=[0-4]*}" ] && {
+	#	t_update_chk=${cmd_line##*update_chk=};
+	#	update_chk=${t_update_chk::1};
+	#} || update_chk=0;
 
-	if [ "$active_bank" = "B" -a "$update_chk" = "0" ]; then
-		/usr/sbin/uboot_env --set --name update_chk --value  2
-	elif [ "$active_bank" = "A" -a "$update_chk" != "0" ]; then
-		/usr/sbin/uboot_env --set --name update_chk --value 0
-	fi
+	#if [ "$active_bank" = "B" -a "$update_chk" = "0" ]; then
+	#	/usr/sbin/uboot_env --set --name update_chk --value  2
+	#elif [ "$active_bank" = "A" -a "$update_chk" != "0" ]; then
+	#	/usr/sbin/uboot_env --set --name update_chk --value 0
+	#fi
 
 	#create certificate for lighthttpd on first boot.
 	if [ ! -s $file ] ; then
@@ -32,21 +38,23 @@ scapi_utils_init()
 	fi
 
 	#check whether fw boot or normal boot
-	if [ -f $fwfile ] ; then
+	#if [ -f $fwfile ] ; then
 
 		#find last running configuration
-		file=`cat ${VENDOR_PATH}/etc/csd/csdswap`
-	        _lastmodified=`echo $file | cut -d \= -f 2`
+	#	file=`cat ${VENDOR_PATH}/csd/etc/csdswap`
+	#	chmod 777 ${VENDOR_PATH}/csd/etc/csdswap
 
-		if [[ $_lastmodified -eq 1 ]] ; then
-			csdutil merge ${VENDOR_PATH}/config/.run-data.xml /rom/${VENDOR_PATH}/etc/datacfg /rom/${VENDOR_PATH}/etc/ctrlcfg
-		else
-			csdutil merge ${VENDOR_PATH}/config/.run-data-swp.xml /rom/${VENDOR_PATH}/etc/datacfg /rom/${VENDOR_PATH}/etc/ctrlcfg
-		fi
+	#        _lastmodified=`echo $file | cut -d \= -f 2`
+
+	#	if [[ $_lastmodified -eq 1 ]] ; then
+	#		csdutil merge ${VENDOR_PATH}/csd/config/.run-data.xml /rom/${VENDOR_PATH}/etc/datacfg /rom/${VENDOR_PATH}/etc/ctrlcfg
+	#	else
+	#		csdutil merge ${VENDOR_PATH}/csd/config/.run-data-swp.xml /rom/${VENDOR_PATH}/etc/datacfg /rom/${VENDOR_PATH}/etc/ctrlcfg
+	#	fi
 
 		#remove fwboot
-		[ -e $fwfile ] && rm $fwfile
-	fi
+	#	[ -e $fwfile ] && rm $fwfile
+	#fi
 
 	#create log soft link under /tmp directory for procd log on boot.