diff --git a/NEWS b/NEWS
index d586380..8a42485 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,14 @@
 Small Footprint CIM Client Library NEWS
 
+Changes in 2.2.5
+================
+
+Bugs:
+- 3586680: improve error reporting in cmciConnect2
+- 3566968: sfcc enumInstances fails to parse the xml
+- 3555103: wrong declaration of release attribute in _CIMCArgsFT
+- 3547832: memory leak in backend/cimxml/grammer.c
+
 Changes in 2.2.4
 ================
 
@@ -10,10 +19,6 @@
 - 3528819: Crash in getInstance when instance has NULL properties
 - 3530609: Various BEAM Errors
 - 3435363: Wrong call of curl_global_cleanup()
-- 3547832: memory leak in backend/cimxml/grammer.c
-- 3555103: wrong declaration of release attribute in _CIMCArgsFT
-- 3566968: sfcc enumInstances fails to parse the xml
-- 3586680: improve error reporting in cmciConnect2
 
 Changes in 2.2.3
 ================
diff --git a/TEST/Makefile.am b/TEST/Makefile.am
index f26191d..138c40b 100644
--- a/TEST/Makefile.am
+++ b/TEST/Makefile.am
@@ -97,7 +97,7 @@
 
 test_ec_SOURCES = test_ec.c \
                    show.c
-test_ec_LDADD = ../libcmpisfcc.la
+test_ec_LDADD = ../libcmpisfcc.la 
 
 test_ecn_SOURCES = test_ecn.c \
                    show.c
@@ -180,25 +180,25 @@
 test_qualifiers2_LDADD = ../libcmpisfcc.la
 
 v2test_ec_SOURCES = v2test_ec.c show.c
-v2test_ec_LDADD   = ../libcmpisfcc.la
+v2test_ec_LDADD   = ../libcmpisfcc.la ../libcimcclient.la
 
 v2test_ecn_SOURCES = v2test_ecn.c show.c
-v2test_ecn_LDADD   = ../libcmpisfcc.la
+v2test_ecn_LDADD   = ../libcmpisfcc.la ../libcimcclient.la
 
 v2test_ei_SOURCES = v2test_ei.c show.c
-v2test_ei_LDADD   = ../libcmpisfcc.la
+v2test_ei_LDADD   = ../libcmpisfcc.la ../libcimcclient.la
 
 v2test_ein_SOURCES = v2test_ein.c show.c
-v2test_ein_LDADD   = ../libcmpisfcc.la
+v2test_ein_LDADD   = ../libcmpisfcc.la ../libcimcclient.la
 
 v2test_gc_SOURCES = v2test_gc.c show.c
-v2test_gc_LDADD   = ../libcmpisfcc.la
+v2test_gc_LDADD   = ../libcmpisfcc.la ../libcimcclient.la
 
 v2test_im_SOURCES = v2test_im.c show.c
-v2test_im_LDADD   = ../libcmpisfcc.la
+v2test_im_LDADD   = ../libcmpisfcc.la ../libcimcclient.la
 
 v2test_xq_synerr_SOURCES = v2test_xq_synerr.c show.c
-v2test_xq_synerr_LDADD   = ../libcmpisfcc.la
+v2test_xq_synerr_LDADD   = ../libcmpisfcc.la ../libcimcclient.la
 
 print_types_SOURCES = print-types.c
 
diff --git a/configure.ac b/configure.ac
index 7c09f34..d128351 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(sblim-sfcc, 2.2.5preview, sblim-devel@lists.sourceforge.net)
+AC_INIT(sblim-sfcc, 2.2.5, sblim-devel@lists.sourceforge.net)
 AC_CONFIG_SRCDIR([cimc/cimcclient.c])
 AC_CONFIG_HEADER([config.h])