diff --git a/libfreerdp-cache/CMakeLists.txt b/libfreerdp-cache/CMakeLists.txt
index 25e0b7727..89f9e3f85 100644
--- a/libfreerdp-cache/CMakeLists.txt
+++ b/libfreerdp-cache/CMakeLists.txt
@@ -31,7 +31,10 @@ add_library(freerdp-cache ${FREERDP_CACHE_SRCS})
 
 set_target_properties(freerdp-cache PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
 
-target_link_libraries(freerdp-cache freerdp-core)
-target_link_libraries(freerdp-cache freerdp-utils)
+set(FREERDP_CACHE_LIBS
+	freerdp-core
+	freerdp-utils)
+
+target_link_libraries(freerdp-cache ${FREERDP_CACHE_LIBS})
 
 install(TARGETS freerdp-cache DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/libfreerdp-channels/CMakeLists.txt b/libfreerdp-channels/CMakeLists.txt
index 56f2fa710..c46fec445 100644
--- a/libfreerdp-channels/CMakeLists.txt
+++ b/libfreerdp-channels/CMakeLists.txt
@@ -26,7 +26,10 @@ set(FREERDP_CHANNELS_SRCS
 add_library(freerdp-channels ${FREERDP_CHANNELS_SRCS})
 
 set_target_properties(freerdp-channels PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
-target_link_libraries(freerdp-channels freerdp-utils)
+
+set(FREERDP_CHANNELS_LIBS
+	freerdp-utils)
+	
+target_link_libraries(freerdp-channels ${FREERDP_CHANNELS_LIBS})
 
 install(TARGETS freerdp-channels DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
diff --git a/libfreerdp-codec/CMakeLists.txt b/libfreerdp-codec/CMakeLists.txt
index 69194daf8..08f445453 100644
--- a/libfreerdp-codec/CMakeLists.txt
+++ b/libfreerdp-codec/CMakeLists.txt
@@ -80,6 +80,11 @@ endif()
 add_library(freerdp-codec ${FREERDP_CODEC_SRCS})
 
 set_target_properties(freerdp-codec PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
-target_link_libraries(freerdp-codec freerdp-utils ${FREERDP_JPEG_LIBS})
+
+set(FREERDP_CODEC_LIBS
+	freerdp-utils
+	${FREERDP_JPEG_LIBS})
+
+target_link_libraries(freerdp-codec ${FREERDP_CODEC_LIBS})
 
 install(TARGETS freerdp-codec DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/libfreerdp-core/CMakeLists.txt b/libfreerdp-core/CMakeLists.txt
index 325d35669..9da4ef88d 100644
--- a/libfreerdp-core/CMakeLists.txt
+++ b/libfreerdp-core/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # Copyright 2011 O.S. Systems Software Ltda.
 # Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
-# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ add_definitions(-DEXT_PATH="${FREERDP_EXTENSION_PATH}")
 include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${ZLIB_INCLUDE_DIRS})
 
-set(LIBFREERDP_CORE_SRCS
+set(FREERDP_CORE_SRCS
 	activation.c
 	activation.h
 	extension.c
@@ -89,33 +89,34 @@ set(LIBFREERDP_CORE_SRCS
 	listener.c
 	listener.h
 	peer.c
-	peer.h
-)
+	peer.h)
 
-add_library(freerdp-core ${LIBFREERDP_CORE_SRCS})
+add_library(freerdp-core ${FREERDP_CORE_SRCS})
 
 set_target_properties(freerdp-core PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
 
+set(FREERDP_CORE_LIBS
+	freerdp-utils
+	freerdp-codec
+	freerdp-crypto
+	freerdp-locale
+	winpr-utils
+	winpr-rpc
+	winpr-sspi)
+
 if(WIN32)
-	target_link_libraries(freerdp-core ws2_32)
+	set(FREERDP_CORE_LIBS ${FREERDP_CORE_LIBS} ws2_32)
 else()
-	target_link_libraries(freerdp-core ${ZLIB_LIBRARIES})	
+	set(FREERDP_CORE_LIBS ${FREERDP_CORE_LIBS} ${ZLIB_LIBRARIES})
 endif()
 
-target_link_libraries(freerdp-core freerdp-utils)
-target_link_libraries(freerdp-core freerdp-codec)
-target_link_libraries(freerdp-core freerdp-locale)
-
-target_link_libraries(freerdp-core winpr-utils)
-target_link_libraries(freerdp-core winpr-rpc)
-target_link_libraries(freerdp-core winpr-sspi)
-
 if(NOT WIN32)
-	target_link_libraries(freerdp-core winpr-registry)
+	set(FREERDP_CORE_LIBS ${FREERDP_CORE_LIBS} winpr-registry)
 endif()
 
-target_link_libraries(freerdp-core freerdp-crypto)
-target_link_libraries(freerdp-core ${OPENSSL_LIBRARIES})
+set(FREERDP_CORE_LIBS ${FREERDP_CORE_LIBS} ${OPENSSL_LIBRARIES})
+
+target_link_libraries(freerdp-core ${FREERDP_CORE_LIBS})
 
 install(TARGETS freerdp-core DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
index 6e5cdd9fa..ef5634f45 100644
--- a/winpr/CMakeLists.txt
+++ b/winpr/CMakeLists.txt
@@ -39,4 +39,3 @@ add_subdirectory(registry)
 add_subdirectory(library)
 
 add_subdirectory(tools)
-