diff --git a/CMakeLists.txt b/CMakeLists.txt
index 251ce2e87..162ae60cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,7 +103,7 @@ ADD_LIBRARY(fishlib STATIC ${FISH_SRCS})
 TARGET_SOURCES(fishlib PRIVATE ${FISH_HEADERS})
 TARGET_LINK_LIBRARIES(fishlib
   ${CURSES_LIBRARY} ${CURSES_EXTRA_LIBRARY} Threads::Threads ${CMAKE_DL_LIBS}
-  ${PCRE2_LIB} muparser)
+  ${PCRE2_LIB} muparser ${Intl_LIBRARIES})
 
 # Define fish.
 ADD_EXECUTABLE(fish src/fish.cpp)
diff --git a/cmake/gettext.cmake b/cmake/gettext.cmake
index 55b408e0c..71ed17c6e 100644
--- a/cmake/gettext.cmake
+++ b/cmake/gettext.cmake
@@ -8,6 +8,7 @@ IF(WITH_GETTEXT)
   FIND_PACKAGE(Gettext)
   IF(GETTEXT_FOUND)
       SET(HAVE_GETTEXT 1)
+      INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIR})
   ENDIF()
 ENDIF()
 ADD_FEATURE_INFO(gettext GETTEXT_FOUND "translate messages with gettext")
@@ -25,7 +26,8 @@ ENDIF()
 # libintl.h can be compiled into the stdlib on some GLibC systems
 IF(Intl_FOUND AND Intl_LIBRARIES)
   SET(LIBINTL_INCLUDE "#include <libintl.h>")
-  SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} intl)
+  SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${Intl_INCLUDE_DIR})
+  SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${Intl_LIBRARIES})
 ENDIF()
 CHECK_CXX_SOURCE_COMPILES("
 ${LIBINTL_INCLUDE}