diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb1b2cc2c..2dc8c0639 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,7 +21,6 @@ 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("limits.h" HAVE_LIMITS_H)
 CHECK_INCLUDE_FILES("locale.h" HAVE_LOCALE_H)
 CHECK_INCLUDE_FILES("netdb.h" HAVE_NETDB_H)
@@ -36,6 +35,9 @@ CHECK_INCLUDE_FILES("pwd.h" HAVE_PWD_H)
 CHECK_INCLUDE_FILES("errno.h" HAVE_ERRNO_H)
 CHECK_INCLUDE_FILES("wchar.h" HAVE_WCHAR_H)
 CHECK_INCLUDE_FILES("langinfo.h" HAVE_LANGINFO_CODESET)
+IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+  CHECK_INCLUDE_FILES("utf8/wchar.h" HAVE_UTF8_WCHAR_H)
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 
 CHECK_FUNCTION_EXISTS(gethostbyname HAVE_GETHOSTBYNAME)
 CHECK_FUNCTION_EXISTS(gethostname HAVE_GETHOSTNAME)
diff --git a/weechat/src/CMakeLists.txt b/weechat/src/CMakeLists.txt
index eb1b2cc2c..2dc8c0639 100644
--- a/weechat/src/CMakeLists.txt
+++ b/weechat/src/CMakeLists.txt
@@ -21,7 +21,6 @@ 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("limits.h" HAVE_LIMITS_H)
 CHECK_INCLUDE_FILES("locale.h" HAVE_LOCALE_H)
 CHECK_INCLUDE_FILES("netdb.h" HAVE_NETDB_H)
@@ -36,6 +35,9 @@ CHECK_INCLUDE_FILES("pwd.h" HAVE_PWD_H)
 CHECK_INCLUDE_FILES("errno.h" HAVE_ERRNO_H)
 CHECK_INCLUDE_FILES("wchar.h" HAVE_WCHAR_H)
 CHECK_INCLUDE_FILES("langinfo.h" HAVE_LANGINFO_CODESET)
+IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+  CHECK_INCLUDE_FILES("utf8/wchar.h" HAVE_UTF8_WCHAR_H)
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 
 CHECK_FUNCTION_EXISTS(gethostbyname HAVE_GETHOSTBYNAME)
 CHECK_FUNCTION_EXISTS(gethostname HAVE_GETHOSTNAME)