diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90b60ae09..838626a9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,7 +104,7 @@ pkg_check_modules(LIBCONFIG IMPORTED_TARGET libconfig>=1.4.9)
 pkg_check_modules(RABBITMQ_C IMPORTED_TARGET librabbitmq>=0.8.0)
 pkg_check_modules(COMEDILIB IMPORTED_TARGET comedilib>=0.11.0)
 pkg_check_modules(LIBZMQ IMPORTED_TARGET libzmq>=2.2.0)
-pkg_check_modules(ULDAQ IMPORTED_TARGET libuldaq>=1.0.0)
+pkg_check_modules(LIBULDAQ IMPORTED_TARGET libuldaq>=1.0.0)
 pkg_check_modules(LIBWEBSOCKETS IMPORTED_TARGET libwebsockets>=2.3.0)
 pkg_check_modules(NANOMSG IMPORTED_TARGET nanomsg)
 if(NOT NANOMSG_FOUND)
diff --git a/lib/nodes/CMakeLists.txt b/lib/nodes/CMakeLists.txt
index 862286691..e2b189e76 100644
--- a/lib/nodes/CMakeLists.txt
+++ b/lib/nodes/CMakeLists.txt
@@ -47,10 +47,10 @@ if(HAS_EVENTFD)
 endif()
 
 # Enable Universal Library for Linux DAQ devices (libuldaq)
-if(ULDAQ_FOUND)
+if(LIBULDAQ_FOUND)
     list(APPEND NODE_SRC uldaq.c)
     list(APPEND INCLUDE_DIRS ${ULDAQ_INCLUDE_DIRS})
-    list(APPEND LIBRARIES uldaq)
+    list(APPEND LIBRARIES PkgConfig::LIBULDAQ)
 endif()
 
 # Enable shared memory node-type
@@ -66,7 +66,7 @@ endif()
 if(LIBIEC61850_FOUND)
     list(APPEND NODE_SRC iec61850_sv.c iec61850.c)
     list(APPEND INCLUDE_DIRS ${LIBIEC61850_INCLUDE_DIRS})
-    list(APPEND LIBRARIES ${LIBIEC61850_LIBRARIES} PkgConfig::LIBIEC61850)
+    list(APPEND LIBRARIES PkgConfig::LIBIEC61850)
 endif()
 
 # Enable OPAL-RT Asynchronous Process support (will result in 32bit binary!!!)