diff --git a/CMakeLists.txt b/CMakeLists.txt
index 969f89a4a..811cf1ca5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,6 +107,7 @@ pkg_check_modules(LIBZMQ IMPORTED_TARGET libzmq>=2.2.0)
 pkg_check_modules(LIBULDAQ IMPORTED_TARGET libuldaq>=1.0.0)
 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)
 if(NOT NANOMSG_FOUND)
     pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0)
@@ -127,7 +128,7 @@ cmake_dependent_option(WITH_TESTS           "Run tests"
 cmake_dependent_option(WITH_PLUGINS         "Build plugins"                                         ON "TOPLEVEL_PROJECT" OFF)
 cmake_dependent_option(WITH_CLIENTS         "Build client applications"                             ON "TOPLEVEL_PROJECT" OFF)
 cmake_dependent_option(WITH_DOC             "Build documentation"                                   ON "TOPLEVEL_PROJECT" OFF)
-cmake_dependent_option(WITH_GRAPHVIZ        "Build with Graphviz"                                   ON "CGRAPH_FOUND" OFF)
+cmake_dependent_option(WITH_GRAPHVIZ        "Build with Graphviz"                                   ON "CGRAPH_FOUND; GVC_FOUND" OFF)
 
 cmake_dependent_option(WITH_NODE_AMQP       "Build with amqp node-type"                             ON "RABBITMQ_C_FOUND" OFF)
 cmake_dependent_option(WITH_NODE_COMEDI     "Build with comedi node-type"                           ON "COMEDILIB_FOUND" OFF)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 8785b989c..c7fdecbe8 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -78,8 +78,8 @@ if(WITH_WEB)
 endif()
 
 if(WITH_GRAPHVIZ)
-    list(APPEND INCLUDE_DIRS ${CGRAPH_INCLUDE_DIRS})
-    list(APPEND LIBRARIES PkgConfig::CGRAPH)
+    list(APPEND INCLUDE_DIRS ${CGRAPH_INCLUDE_DIRS} ${GVC_INCLUDE_DIRS})
+    list(APPEND LIBRARIES PkgConfig::CGRAPH PkgConfig::GVC)
 endif()
 
 if(WITH_NODE_INFINIBAND)