diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake
index 3db79cf7e..539f2c6c1 100644
--- a/cmake/FindGettext.cmake
+++ b/cmake/FindGettext.cmake
@@ -43,23 +43,23 @@ CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)
 
 IF(HAVE_LIBINTL_H)
 
-  IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    SET(CMAKE_REQUIRED_LIBRARIES "iconv")
-    CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
-  ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
-  ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-
+  CHECK_FUNCTION_EXISTS(dgettext LIBC_HAS_DGETTEXT)
   IF(LIBC_HAS_DGETTEXT)
     SET(GETTEXT_FOUND TRUE)
   ELSE(LIBC_HAS_DGETTEXT)
-    FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl libintl
+    FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl
       PATHS
       /usr/local/lib
       /usr/lib
       )
     IF(LIBINTL_LIBRARY)
-      CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
+      IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+        SET(CMAKE_REQUIRED_LIBRARIES "iconv")
+        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
+      ELSE(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
+      ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+      
       IF(LIBINTL_HAS_DGETTEXT)
 	SET(GETTEXT_FOUND TRUE)
       ENDIF(LIBINTL_HAS_DGETTEXT)
diff --git a/weechat/cmake/FindGettext.cmake b/weechat/cmake/FindGettext.cmake
index 3db79cf7e..539f2c6c1 100644
--- a/weechat/cmake/FindGettext.cmake
+++ b/weechat/cmake/FindGettext.cmake
@@ -43,23 +43,23 @@ CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)
 
 IF(HAVE_LIBINTL_H)
 
-  IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    SET(CMAKE_REQUIRED_LIBRARIES "iconv")
-    CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
-  ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
-  ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-
+  CHECK_FUNCTION_EXISTS(dgettext LIBC_HAS_DGETTEXT)
   IF(LIBC_HAS_DGETTEXT)
     SET(GETTEXT_FOUND TRUE)
   ELSE(LIBC_HAS_DGETTEXT)
-    FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl libintl
+    FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl
       PATHS
       /usr/local/lib
       /usr/lib
       )
     IF(LIBINTL_LIBRARY)
-      CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
+      IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+        SET(CMAKE_REQUIRED_LIBRARIES "iconv")
+        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
+      ELSE(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
+      ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+      
       IF(LIBINTL_HAS_DGETTEXT)
 	SET(GETTEXT_FOUND TRUE)
       ENDIF(LIBINTL_HAS_DGETTEXT)