diff --git a/CMakeLists.txt b/CMakeLists.txt
index 331c467e56..df34e935e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -519,6 +519,9 @@ IF(WITH_POINTMATCHER)
     find_package(libpointmatcher QUIET)
     IF(libpointmatcher_FOUND)
        MESSAGE(STATUS "Found libpointmatcher: ${libpointmatcher_INCLUDE_DIRS}")
+       # Find libnabo:
+       find_package(libnabo REQUIRED PATHS ${LIBNABO_INSTALL_DIR})
+       message(STATUS "libnabo found, version ${libnabo_VERSION} (Config mode)")
     ENDIF(libpointmatcher_FOUND)
 ENDIF(WITH_POINTMATCHER)
 
diff --git a/corelib/src/CMakeLists.txt b/corelib/src/CMakeLists.txt
index 1922e68801..8e12bf58a9 100644
--- a/corelib/src/CMakeLists.txt
+++ b/corelib/src/CMakeLists.txt
@@ -457,6 +457,7 @@ IF(libpointmatcher_FOUND)
 	SET(LIBRARIES
 		${LIBRARIES}
 		${libpointmatcher_LIBRARIES}
+		libnabo::nabo
 	)
 ENDIF(libpointmatcher_FOUND)