diff --git a/AboutThisBuild.txt.in b/AboutThisBuild.txt.in
index 4d8f4f3fe..065b6c6cc 100644
--- a/AboutThisBuild.txt.in
+++ b/AboutThisBuild.txt.in
@@ -8,6 +8,7 @@ System: ${SYSTEM}
 Bit depth: ${PROC_BIT_DEPTH}
 Gtkmm: V${GTKMM_VERSION}
 Lensfun: V${LENSFUN_VERSION}
+libjxl: V${JXL_VERSION}
 Build type: ${BUILD_TYPE}
 Build flags: ${CXX_FLAGS}
 Link flags: ${LFLAGS}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe7884ee9..b6c053dd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -560,14 +560,19 @@ if(WITH_JXL AND NOT WITH_JXL STREQUAL "AUTO")
 else()
     set(JXL_REQUIRED "")
 endif()
-pkg_check_modules(JXL ${JXL_REQUIRED} IMPORTED_TARGET libjxl libjxl_threads)
+pkg_check_modules(JXL ${JXL_REQUIRED} IMPORTED_TARGET libjxl)
+pkg_check_modules(JXLTHREADS ${JXL_REQUIRED} IMPORTED_TARGET libjxl_threads)
 if(JXL_FOUND)
     if(WITH_JXL OR WITH_JXL STREQUAL "AUTO")
         add_definitions(-DLIBJXL)
+        list(APPEND JXL_INCLUDE_DIRS ${JXLTHREADS_INCLUDE_DIRS})
+        list(APPEND JXL_LIBRARIES ${JXLTHREADS_LIBRARIES})
     else()
         message(STATUS "  JXL support disabled by WITH_JXL = ${WITH_JXL}")
         set(JXL_INCLUDE_DIRS "")
         set(JXL_LIBRARIES "")
+        set(JXLTHREADS_INCLUDE_DIRS "")
+        set(JXLTHREADS_LIBRARIES "")
     endif()
 endif()
 
@@ -751,6 +756,7 @@ if(NOT APPLE)
         -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
         -DOPTION_OMP:STRING=${OPTION_OMP}
         -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
+        -DJXL_VERSION:STRING=${JXL_VERSION}
         -DLENSFUN_VERSION:STRING=${LENSFUN_VERSION})
 endif()
 
@@ -780,6 +786,7 @@ elseif(APPLE)
              -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
              -DOPTION_OMP:STRING=${OPTION_OMP}
              -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
+             -DJXL_VERSION:STRING=${JXL_VERSION}
              -DLENSFUN_VERSION:STRING=${LENSFUN_VERSION}
              -P ${PROJECT_SOURCE_DIR}/UpdateInfo.cmake)
 else()