diff --git a/Build/AtlasLCG/LCGConfig.cmake b/Build/AtlasLCG/LCGConfig.cmake
index 33405c31119badc714ec80691e3d748591f857f8..24ebf8a9775ccfcee26bb96f52ec2a34ba493b78 100644
--- a/Build/AtlasLCG/LCGConfig.cmake
+++ b/Build/AtlasLCG/LCGConfig.cmake
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: LCGConfig.cmake 746545 2016-05-12 11:40:48Z krasznaa $
+# $Id: LCGConfig.cmake 751138 2016-05-31 13:50:48Z krasznaa $
 #
 # File implementing the code that gets called when a project imports
 # LCG using something like:
@@ -381,6 +381,8 @@ set( PYTHON_LIBRARY ${PYTHON_LIBRARY}
 list( APPEND CMAKE_PREFIX_PATH ${DOXYGEN_ROOT} )
 set( GSL_ROOT_DIR ${GSL_ROOT} )
 list( APPEND CMAKE_PREFIX_PATH ${QT_ROOT} )
+list( APPEND CMAKE_PREFIX_PATH ${QT5_ROOT} )
+list( APPEND CMAKE_PREFIX_PATH ${GRAPHVIZ_ROOT} )
 list( APPEND CMAKE_PREFIX_PATH ${COIN3D_ROOT} )
 list( APPEND CMAKE_PREFIX_PATH ${EXPAT_ROOT} )
 
diff --git a/Build/AtlasLCG/modules/FindDoxygen.cmake b/Build/AtlasLCG/modules/FindDoxygen.cmake
index 2d8e8c97e78ba600ccf9732b0ea4f187ca637b49..f1b1d40570712266a8fa9ab2cf204191e4379d67 100644
--- a/Build/AtlasLCG/modules/FindDoxygen.cmake
+++ b/Build/AtlasLCG/modules/FindDoxygen.cmake
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: FindDoxygen.cmake 719980 2016-01-27 08:38:07Z krasznaa $
+# $Id: FindDoxygen.cmake 751138 2016-05-31 13:50:48Z krasznaa $
 #
 # This file is here to intercept find_package(Doxygen) calls, and extend the
 # environment setup file of the project with the correct Doxygen paths.
@@ -33,5 +33,11 @@ if( DOXYGEN_EXECUTABLE )
    get_filename_component( DOXYGEN_BINARY_PATH ${DOXYGEN_EXECUTABLE} PATH )
 endif()
 
+# This is just needed to set up a proper dependency on graphviz:
+if( DOXYGEN_DOT_FOUND )
+   set( GRAPHVIZ_FOUND TRUE )
+endif()
+
 # Set up the RPM dependency:
 lcg_need_rpm( doxygen )
+lcg_need_rpm( graphviz )