diff --git a/src/XrdCl/CMakeLists.txt b/src/XrdCl/CMakeLists.txt
index 32d3ccb4e14..a2b9ee9f79e 100644
--- a/src/XrdCl/CMakeLists.txt
+++ b/src/XrdCl/CMakeLists.txt
@@ -111,8 +111,8 @@ target_link_libraries(
   XrdCl
   XrdXml
   XrdUtils
+  uuid::uuid
   ${CMAKE_THREAD_LIBS_INIT}
-  ${UUID_LIBRARY}
   ${ZLIB_LIBRARIES}
   ${EXTRA_LIBS}
   ${CMAKE_DL_LIBS}
diff --git a/src/XrdMacaroons.cmake b/src/XrdMacaroons.cmake
index 5d7fa608466..148ba914481 100644
--- a/src/XrdMacaroons.cmake
+++ b/src/XrdMacaroons.cmake
@@ -10,7 +10,7 @@ set( LIB_XRD_MACAROONS  XrdMacaroons-${PLUGIN_VERSION} )
 #-------------------------------------------------------------------------------
 
 if( BUILD_MACAROONS )
-  include_directories(${MACAROONS_INCLUDES} ${JSON_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
+  include_directories(${MACAROONS_INCLUDES} ${JSON_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
 
   add_library(
     ${LIB_XRD_MACAROONS}
@@ -25,10 +25,10 @@ if( BUILD_MACAROONS )
     XrdHttpUtils
     XrdUtils
     XrdServer
+    uuid::uuid
     ${MACAROONS_LIB}
     ${JSON_LIBRARIES}
     ${XROOTD_HTTP_LIB}
-    ${UUID_LIBRARIES}
     ${OPENSSL_CRYPTO_LIBRARY})
 
   if( MacOSX )