diff --git a/assets/cppserver/database/Makefile.am b/assets/cppserver/database/Makefile.am
index 279fd386f..8a49347e1 100644
--- a/assets/cppserver/database/Makefile.am
+++ b/assets/cppserver/database/Makefile.am
@@ -9,8 +9,8 @@ AM_CPPFLAGS = $(ORB_INCLUDE_PREFIX)  $(LIBZMQ_CFLAGS) \
 
 AM_CXXFLAGS= -Wall -D_FORTIFY_SOURCE=2 -O1 -fPIE
 
-LDADD = -L$(top_builddir)/lib/cpp/client -ltango -L$(top_builddir)/lib/cpp/log4tango/src \
-        -llog4tango $(DB_LDFLAGS) \
+LDADD = -L$(top_builddir)/lib/cpp/client -ltango \
+         $(DB_LDFLAGS) \
          $(DB_LDLIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS)  $(LIBZMQ_LIBS)
 
 AM_LDFLAGS = -Wl,-z,now -pie
diff --git a/assets/cppserver/starter/Makefile.am b/assets/cppserver/starter/Makefile.am
index 307df76cd..e497cc630 100644
--- a/assets/cppserver/starter/Makefile.am
+++ b/assets/cppserver/starter/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib/cpp/server \
            -I$(top_builddir)/lib/cpp/log4tango/include $(LIBZMQ_CFLAGS)
 
 LDADD = -L$(top_builddir)/lib/cpp/client -ltango \
-        -L$(top_builddir)/lib/cpp/log4tango/src -llog4tango \
 		$(LIBZMQ_LIBS)
 
 bin_PROGRAMS=Starter
diff --git a/assets/cppserver/tangoaccesscontrol/Makefile.am b/assets/cppserver/tangoaccesscontrol/Makefile.am
index b69ddb544..46a8cbb40 100644
--- a/assets/cppserver/tangoaccesscontrol/Makefile.am
+++ b/assets/cppserver/tangoaccesscontrol/Makefile.am
@@ -21,6 +21,5 @@ TangoAccessControl_SOURCES=ClassFactory.cpp     		\
 
 
 TangoAccessControl_LDADD = -L$(top_builddir)/lib/cpp/client -ltango \
-        					-L$(top_builddir)/lib/cpp/log4tango/src -llog4tango \
 							$(DB_LDFLAGS) $(DB_LDLIBS) $(LIBZMQ_LIBS) \
 							../AbstractClass/AccessControl/libaccesscontrol.la
diff --git a/assets/cppserver/tangotest/Makefile.am b/assets/cppserver/tangotest/Makefile.am
index dec614dee..c75ff73c4 100644
--- a/assets/cppserver/tangotest/Makefile.am
+++ b/assets/cppserver/tangotest/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib/cpp/client \
            -I$(top_builddir)/lib/cpp/log4tango/include  $(LIBZMQ_CFLAGS)
 
 LDADD = -L$(top_builddir)/lib/cpp/client -ltango \
-        -L$(top_builddir)/lib/cpp/log4tango/src -llog4tango \
  		$(LIBZMQ_LIBS)
 
 bin_PROGRAMS=TangoTest
diff --git a/assets/lib/cpp/client/Makefile.am b/assets/lib/cpp/client/Makefile.am
index 6eee86b39..71fa848ea 100644
--- a/assets/lib/cpp/client/Makefile.am
+++ b/assets/lib/cpp/client/Makefile.am
@@ -15,7 +15,7 @@ libtango_la_LIBADD = ../server/libserver.la	\
              ../server/idl/libidl.la \
 		     ../server/jpeg/libjpeg.la \
 		     ../server/jpeg_mmx/libjpeg_mmx.la \
-		     ../log4tango/src/liblog4tango.la \
+		     ../log4tango/src/liblog4tangointernal.la \
 		     $(LIBZMQ_LIBS)
 
 # We need to set the -version-info for libtool so that libtool will
diff --git a/assets/lib/cpp/log4tango/src/Makefile.am b/assets/lib/cpp/log4tango/src/Makefile.am
index e2d6457e4..4de916289 100644
--- a/assets/lib/cpp/log4tango/src/Makefile.am
+++ b/assets/lib/cpp/log4tango/src/Makefile.am
@@ -1,10 +1,10 @@
-noinst_LTLIBRARIES = liblog4tango.la
+noinst_LTLIBRARIES = liblog4tangointernal.la
 
 INCLUDES = -I../include -I$(top_srcdir)/include
 
 noinst_HEADERS = snprintf.c
 
-liblog4tango_la_SOURCES = \
+liblog4tangointernal_la_SOURCES = \
   Appender.cpp \
   AppenderAttachable.cpp \
   LayoutAppender.cpp \
@@ -31,4 +31,8 @@ liblog4tango_la_SOURCES = \
   PortabilityImpl.hh \
   PortabilityImpl.cpp
 
+liblog4tangointernal_la_LDFLAGS = -version-info @LT_VERSION@
+
+lib_LTLIBRARIES = liblog4tango.la
 liblog4tango_la_LDFLAGS = -version-info @LT_VERSION@
+liblog4tango_la_SOURCES =
diff --git a/assets/lib/cpp/tango.pc.in b/assets/lib/cpp/tango.pc.in
index 8d5b61c7f..820b59117 100644
--- a/assets/lib/cpp/tango.pc.in
+++ b/assets/lib/cpp/tango.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: tango
 Description: The tango constrol system library
-Requires: omniDynamic4 >= 4.1.6, omniCOS4, log4tango, libzmq
+Requires: omniDynamic4 >= 4.1.6, omniCOS4, libzmq
 Version: @VERSION@
 Libs: -L${libdir} -ltango
 Cflags: @CPP_ELEVEN@ -I${includedir}/tango
diff --git a/assets/utils/tango_admin/Makefile.am b/assets/utils/tango_admin/Makefile.am
index 00ddb6774..5193caeae 100644
--- a/assets/utils/tango_admin/Makefile.am
+++ b/assets/utils/tango_admin/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib/cpp/client \
            -I$(top_builddir)/lib/cpp/log4tango/include $(LIBZMQ_CFLAGS)
 
 LDADD = -L$(top_builddir)/lib/cpp/client -ltango \
-        -L$(top_builddir)/lib/cpp/log4tango/src -llog4tango \
 		$(LIBZMQ_LIBS)
 
 bin_PROGRAMS=tango_admin
diff --git a/build.xml b/build.xml
index dbbd087d9..0651aae95 100644
--- a/build.xml
+++ b/build.xml
@@ -76,6 +76,13 @@
             <arg value="-B${workdir}/cpp/cmake-build"/>
             <arg value="-DIDL_BASE=${workdir}/idl/install"/>
         </exec>
+        <exec executable="sed" failonerror="true" failifexecutionfails="true">
+            <arg value="-i"/>
+            <arg value="1s/5\.0\.1/5.0.2/;18s/5:1:0/5:2:0/"/>
+            <arg value="${workdir}/cpp/log4tango/configure.in"/>
+        </exec>
+        <exec executable="autoconf" dir="${workdir}/cpp/log4tango" failonerror="true" failifexecutionfails="true">
+        </exec>
     </target>
 
     <target name="-copy-cppTango" depends="-pre-copy-cppTango">