diff --git a/CMakeScripts/FindANTLR.cmake b/CMakeScripts/FindANTLR.cmake
index 7a96424f9a45f94b78b097cb850a2c8970686755..655e33800da8180762f435a08f7e149cbcba5e25 100644
--- a/CMakeScripts/FindANTLR.cmake
+++ b/CMakeScripts/FindANTLR.cmake
@@ -21,7 +21,7 @@ else (ANTLR_INCLUDE_DIR AND ANTLR_LIBRARY)
 # Look for the library.
   find_library(
     ANTLR_LIBRARY
-    NAMES antlr
+    NAMES antlr-pic
     DOC "Library to link against for ANTLR")
   mark_as_advanced(ANTLR_LIBRARY)
 
diff --git a/libwccl/CMakeLists.txt b/libwccl/CMakeLists.txt
index 0eb4448c8de3e8963c9e558eae6147798086a159..ce7740e524d6227c5cebdd2665282f54a93f9e88 100644
--- a/libwccl/CMakeLists.txt
+++ b/libwccl/CMakeLists.txt
@@ -24,10 +24,8 @@ set(LIBS ${LIBS} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
 find_package(ANTLR REQUIRED)
 include_directories(${ANTLR_INCLUDE_DIR})
 
-if(WIN32)
 # On UNIX this should be included only in final executables
-	set(LIBS ${LIBS} ${ANTLR_LIBRARY})
-endif(WIN32)
+set(LIBS ${LIBS} ${ANTLR_LIBRARY})
 
 SET(libwccl_STAT_SRC
 	exception.cpp
@@ -186,4 +184,3 @@ set_target_properties(wccl PROPERTIES
 		PATTERN "build" EXCLUDE
 		PATTERN "CMake*" EXCLUDE
 	)
-