diff --git a/intl/CMakeLists.txt b/intl/CMakeLists.txt
index d6aac566df..e7f8f5dd4c 100644
--- a/intl/CMakeLists.txt
+++ b/intl/CMakeLists.txt
@@ -50,8 +50,7 @@ if(ICONV_FOUND)
 endif()
 
 add_library(intl STATIC ${intl_sources} ${intl_headers})
-set(LIBINTL_LIBRARIES intl)
-add_custom_target(intl_target DEPENDS intl)
+set(LIBINTL_LIBRARIES intl CACHE STRING "libintl library" FORCE)
 
 if(ICONV_FOUND)
 	target_link_libraries(intl ${ICONV_LIBRARY})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 58405216f5..b920452369 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -127,17 +127,11 @@ target_link_libraries(${_lyx}
 	frontend_qt4
 	graphics
 	support
+	${LIBINTL_LIBRARIES}
 	${ICONV_LIBRARY}
 	${QT_QTMAIN_LIBRARY}
 	${vld_dll})
 
-if(NOT LYX_EXTERNAL_LIBINTL OR WIN32)
-  # TODO remove, use LIBINTL_LIBRARIES
-  target_link_libraries(${_lyx} intl)
-  add_dependencies(${_lyx} intl_target)
-else()
-	target_link_libraries(${_lyx} ${LIBINTL_LIBRARIES})
-endif()
 
 if(HUNSPELL_FOUND)
 	target_link_libraries(${_lyx} ${HUNSPELL_LIBRARY})