diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61c57d7a3e1..16a471f821c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -469,6 +469,7 @@ message(STATUS " ")
 message(STATUS "Documentation:")
 message(STATUS "enabled: ${ENABLE_DOCS}")
 message(STATUS "doxygen: ${DOXYGEN_EXECUTABLE}")
+message(STATUS "dot (graphviz): ${DOXYGEN_DOT_EXECUTABLE}")
 message(STATUS "asciidoc: ${ASCIIDOC_EXECUTABLE}")
 
 # ---------- PATHS
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index b8c5bc5baf5..0a5e627c2c3 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -8,6 +8,12 @@ if(ENABLE_DOCS)
         set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
         set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
 
+        # configure for graphviz
+        set(DOXYGEN_DIAGRAM "NO")
+        if(DOXYGEN_DOT_FOUND)
+            set(DOXYGEN_DIAGRAM "YES")
+        endif()
+
         # request to configure the file
         configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
 
diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
index f48a3e763e6..ea85b4a21c5 100644
--- a/docs/Doxyfile.in
+++ b/docs/Doxyfile.in
@@ -1220,7 +1220,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section 
 # have no effect if this option is set to NO (the default)
 
-HAVE_DOT               = NO
+HAVE_DOT               = @DOXYGEN_DIAGRAM@
 
 # By default doxygen will write a font called FreeSans.ttf to the output 
 # directory and reference it in all dot files that doxygen generates. This 
@@ -1316,7 +1316,7 @@ DIRECTORY_GRAPH        = YES
 # generated by dot. Possible values are png, jpg, or gif
 # If left blank png will be used.
 
-DOT_IMAGE_FORMAT       = png
+DOT_IMAGE_FORMAT       = svg
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.