diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake
index 6cc6170ce..c5c1cf541 100644
--- a/cmake/FindGettext.cmake
+++ b/cmake/FindGettext.cmake
@@ -32,6 +32,13 @@ INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckLibraryExists)
 INCLUDE(CheckFunctionExists)
 
+FIND_PATH(LIBINTL_INCLUDE
+  NAMES libintl.h
+  PATH /usr/local/include /usr/pkg/include /usr/include
+)
+
+SET(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE})
+
 CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)
 
 IF(HAVE_LIBINTL_H)
@@ -41,8 +48,8 @@ IF(HAVE_LIBINTL_H)
   ELSE(LIBC_HAS_DGETTEXT)
     FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl libintl
       PATHS
-      /usr/lib
       /usr/local/lib
+      /usr/lib
       )
     IF(LIBINTL_LIBRARY)
       CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
index 5efbec59d..2fe0d9a12 100644
--- a/cmake/FindIconv.cmake
+++ b/cmake/FindIconv.cmake
@@ -54,6 +54,12 @@ IF(ICONV_INCLUDE_PATH)
 ENDIF(ICONV_INCLUDE_PATH)
 
 include(CheckCSourceCompiles)
+
+IF(ICONV_LIBRARY)
+  SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
+  SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
+ENDIF(ICONV_LIBRARY)
+
 SET(CMAKE_REQUIRED_FLAGS -Werror)
 check_c_source_compiles("
   #include <iconv.h>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2694d55d1..eb1b2cc2c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,7 +21,7 @@ INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckFunctionExists)
 
 CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
-CHECK_INCLUDE_FILES("libintl.h" HAVE_LIBINTL_H)
+#CHECK_INCLUDE_FILES("libintl.h" HAVE_LIBINTL_H)
 CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
 CHECK_INCLUDE_FILES("locale.h" HAVE_LOCALE_H)
 CHECK_INCLUDE_FILES("netdb.h" HAVE_NETDB_H)
diff --git a/weechat/cmake/FindGettext.cmake b/weechat/cmake/FindGettext.cmake
index 6cc6170ce..c5c1cf541 100644
--- a/weechat/cmake/FindGettext.cmake
+++ b/weechat/cmake/FindGettext.cmake
@@ -32,6 +32,13 @@ INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckLibraryExists)
 INCLUDE(CheckFunctionExists)
 
+FIND_PATH(LIBINTL_INCLUDE
+  NAMES libintl.h
+  PATH /usr/local/include /usr/pkg/include /usr/include
+)
+
+SET(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE})
+
 CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)
 
 IF(HAVE_LIBINTL_H)
@@ -41,8 +48,8 @@ IF(HAVE_LIBINTL_H)
   ELSE(LIBC_HAS_DGETTEXT)
     FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl libintl
       PATHS
-      /usr/lib
       /usr/local/lib
+      /usr/lib
       )
     IF(LIBINTL_LIBRARY)
       CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
diff --git a/weechat/cmake/FindIconv.cmake b/weechat/cmake/FindIconv.cmake
index 5efbec59d..2fe0d9a12 100644
--- a/weechat/cmake/FindIconv.cmake
+++ b/weechat/cmake/FindIconv.cmake
@@ -54,6 +54,12 @@ IF(ICONV_INCLUDE_PATH)
 ENDIF(ICONV_INCLUDE_PATH)
 
 include(CheckCSourceCompiles)
+
+IF(ICONV_LIBRARY)
+  SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
+  SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
+ENDIF(ICONV_LIBRARY)
+
 SET(CMAKE_REQUIRED_FLAGS -Werror)
 check_c_source_compiles("
   #include <iconv.h>
diff --git a/weechat/src/CMakeLists.txt b/weechat/src/CMakeLists.txt
index 2694d55d1..eb1b2cc2c 100644
--- a/weechat/src/CMakeLists.txt
+++ b/weechat/src/CMakeLists.txt
@@ -21,7 +21,7 @@ INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckFunctionExists)
 
 CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
-CHECK_INCLUDE_FILES("libintl.h" HAVE_LIBINTL_H)
+#CHECK_INCLUDE_FILES("libintl.h" HAVE_LIBINTL_H)
 CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
 CHECK_INCLUDE_FILES("locale.h" HAVE_LOCALE_H)
 CHECK_INCLUDE_FILES("netdb.h" HAVE_NETDB_H)