diff --git a/ThirdParty/sw_services/lwip140/data/lwip140.tcl b/ThirdParty/sw_services/lwip140/data/lwip140.tcl
index bba48413..31257015 100755
--- a/ThirdParty/sw_services/lwip140/data/lwip140.tcl
+++ b/ThirdParty/sw_services/lwip140/data/lwip140.tcl
@@ -400,7 +400,7 @@ proc generate_lwip_opts {libhandle} {
 	set thread_prio [get_property CONFIG.socket_mode_thread_prio $libhandle]
 	if {$api_mode == "SOCKET_API"} {
 		set sw_proc_handle [get_sw_processor]
-		set os_handle [get_cells [get_property HW_INSTANCE $sw_proc_handle]]
+		set os_handle [get_os]
 		set os_name [get_property NAME $os_handle]
 		if { [string compare -nocase "xilkernel" $os_name] == 0} {
 			puts $lwipopts_fd "\#define OS_IS_XILKERNEL"
diff --git a/ThirdParty/sw_services/lwip140/src/ChangeLog b/ThirdParty/sw_services/lwip140/src/ChangeLog
index 23d34b81..5588a331 100755
--- a/ThirdParty/sw_services/lwip140/src/ChangeLog
+++ b/ThirdParty/sw_services/lwip140/src/ChangeLog
@@ -1,6 +1,8 @@
 Change Log for lwip
 =================================
 2014-13-06
+	* Fix for CR 802558 - LWIP library doesn't compile
+	with XilKernel/FreeRTOS BSP.
 	* Fix for CR 801076 - Few configurable options of
 	library are not propagated during compilation.
 2014-06-06