diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85ebe71a3826c93b534118016fb6a5fef14bc793..5318e51b659e3e0e9490bdf0fb845f6e80cae415 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -617,12 +617,16 @@ IF(GETTEXT_FOUND)
   FIND_PATH(GETTEXT_INCLUDE_DIR
     libintl.h
     DOC "Path to gettext include directory (where libintl.h can be found)")
- FIND_LIBRARY(GETTEXT_LIBRARY gettextlib
-    DOC "GetText library")
   MARK_AS_ADVANCED(GETTEXT_INCLUDE_DIR)
+
   IF(GETTEXT_INCLUDE_DIR)
     INCLUDE_DIRECTORIES(${GETTEXT_INCLUDE_DIR})
   ENDIF(GETTEXT_INCLUDE_DIR)
+
+  FIND_LIBRARY(GETTEXT_LIBRARY gettextlib DOC "GetText library")
+  IF(APPLE OR WIN32)
+    FIND_LIBRARY(GETTEXT_INTL_LIBRARY intl DOC "GetText intl library")
+  ENDIF(APPLE OR WIN32)
 ELSE(GETTEXT_FOUND)
   SET(OTB_I18N 0)
   MESSAGE(STATUS
diff --git a/Code/Common/CMakeLists.txt b/Code/Common/CMakeLists.txt
index 4ada7fb1cb399ae2da1503efa4cdbeda6c15325a..f13715fa4a9f6bc717b05168f108f73ffea8a5b1 100644
--- a/Code/Common/CMakeLists.txt
+++ b/Code/Common/CMakeLists.txt
@@ -24,6 +24,9 @@ ENDIF(OTB_USE_PQXX)
 
 IF(GETTEXT_FOUND)
     TARGET_LINK_LIBRARIES(OTBCommon ${GETTEXT_LIBRARY})
+    IF(APPLE OR WIN32)
+       TARGET_LINK_LIBRARIES(OTBCommon ${GETTEXT_INTL_LIBRARY})
+    ENDIF(APPLE OR WIN32)
 ENDIF(GETTEXT_FOUND)
 
 IF(OTB_LIBRARY_PROPERTIES)