diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf0b8ac94..e03ccfee7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,6 @@ endif()
 # Check packages
 find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Mosquitto)
 find_package(Opal)
 find_package(IBVERBS)
 find_package(RDMACM)
@@ -108,6 +107,7 @@ pkg_check_modules(CRITERION IMPORTED_TARGET criterion>=2.3.1)
 pkg_check_modules(LIBNL3_ROUTE IMPORTED_TARGET libnl-route-3.0>=3.2.27)
 pkg_check_modules(LIBIEC61850 IMPORTED_TARGET libiec61850>=1.2)
 pkg_check_modules(LIBCONFIG IMPORTED_TARGET libconfig>=1.4.9)
+pkg_check_modules(MOSQUITTO IMPORTED_TARGET mosquitto>=1.6.10)
 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)
@@ -116,7 +116,6 @@ pkg_check_modules(UUID IMPORTED_TARGET REQUIRED uuid>=2.23)
 pkg_check_modules(CGRAPH IMPORTED_TARGET libcgraph>=2.30)
 pkg_check_modules(GVC IMPORTED_TARGET libgvc>=2.30)
 pkg_check_modules(NANOMSG IMPORTED_TARGET nanomsg)
-pkg_check_modules(XIL IMPORTED_TARGET libxil)
 if(NOT NANOMSG_FOUND)
     pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0)
 endif()
diff --git a/cmake/FindMosquitto.cmake b/cmake/FindMosquitto.cmake
deleted file mode 100644
index e8ac54313..000000000
--- a/cmake/FindMosquitto.cmake
+++ /dev/null
@@ -1,40 +0,0 @@
-# CMakeLists.txt.
-#
-# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
-# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
-# @license GNU General Public License (version 3)
-#
-# VILLASnode
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-###################################################################################
-
-find_path(MOSQUITTO_INCLUDE_DIR
-	NAMES mosquitto.h
-)
-
-find_library(MOSQUITTO_LIBRARY
-	NAMES mosquitto
-)
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set VILLASNODE_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(Mosquitto DEFAULT_MSG
-    MOSQUITTO_LIBRARY MOSQUITTO_INCLUDE_DIR)
-
-mark_as_advanced(MOSQUITTO_INCLUDE_DIR MOSQUITTO_LIBRARY)
-
-set(MOSQUITTO_LIBRARIES ${MOSQUITTO_LIBRARY})
-set(MOSQUITTO_INCLUDE_DIRS ${MOSQUITTO_INCLUDE_DIR})
diff --git a/lib/nodes/CMakeLists.txt b/lib/nodes/CMakeLists.txt
index 96fb36801..e4505b43e 100644
--- a/lib/nodes/CMakeLists.txt
+++ b/lib/nodes/CMakeLists.txt
@@ -125,8 +125,7 @@ endif()
 # Enable MQTT support
 if(WITH_NODE_MQTT)
     list(APPEND NODE_SRC mqtt.cpp)
-    list(APPEND INCLUDE_DIRS ${MOSQUITTO_INCLUDE_DIRS})
-    list(APPEND LIBRARIES ${MOSQUITTO_LIBRARIES})
+    list(APPEND LIBRARIES PkgConfig::MOSQUITTO)
 endif()
 
 # Enable Comedi support