diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index 4816da9..b102068 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -578,6 +578,8 @@ bool cmGraphVizWriter::GenerateForTargetType(cmTarget::TargetType targetType)
       return this->GenerateForSharedLibs;
     case cmTarget::MODULE_LIBRARY:
       return this->GenerateForModuleLibs;
+    case cmTarget::UTILITY:
+      return this->GenerateForModuleLibs;
     default:
       break;
   }

From e384ad13ef7b461a3091b6620178ca8f48df51da Mon Sep 17 00:00:00 2001
From: Andreas Hartmetz <andreas.hartmetz@kdab.com>
Date: Mon, 22 Jun 2015 17:45:01 +0200
Subject: [PATCH 1/2] Update a wrong comment. It was maybe correct a long time
 ago.

---
 Source/cmTarget.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 6916bd3..2aa0e20 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -238,9 +238,10 @@ public:
   bool GetHaveInstallRule() const { return this->HaveInstallRule; }
   void SetHaveInstallRule(bool h) { this->HaveInstallRule = h; }
 
-  /** Add a utility on which this project depends. A utility is an executable
-   * name as would be specified to the ADD_EXECUTABLE or UTILITY_SOURCE
-   * commands. It is not a full path nor does it have an extension.
+  /**
+   * Add a utility dependency to this target. A utility dependency is an
+   * arbitrary dependency on the target named u; this is used by and
+   * therefore acts exactly as documented by the add_dependencies() command.
    */
   void AddUtility(const std::string& u, cmMakefile *makefile = 0);
   ///! Get the utilities used by this target
-- 
2.1.4

From 5dc08b78e25a5006204ea7377596d9314038dc36 Mon Sep 17 00:00:00 2001
From: Andreas Hartmetz <andreas.hartmetz@kdab.com>
Date: Mon, 22 Jun 2015 17:45:01 +0200
Subject: [PATCH 1/2] Update documentation of cmTarget::AddUtility().

The comment did not describe what it actually does anymore.
---
 Source/cmTarget.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 6916bd3..fbc9941 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -238,9 +238,9 @@ public:
   bool GetHaveInstallRule() const { return this->HaveInstallRule; }
   void SetHaveInstallRule(bool h) { this->HaveInstallRule = h; }
 
-  /** Add a utility on which this project depends. A utility is an executable
-   * name as would be specified to the ADD_EXECUTABLE or UTILITY_SOURCE
-   * commands. It is not a full path nor does it have an extension.
+  /**
+   * Add a utility dependency to this target. A utility dependency is an
+   * arbitrary dependency on the target named u.
    */
   void AddUtility(const std::string& u, cmMakefile *makefile = 0);
   ///! Get the utilities used by this target
-- 
2.1.4

From ef6fd0370c688d40dded3b416ea1c475e2f0153b Mon Sep 17 00:00:00 2001
From: Andreas Hartmetz <andreas.hartmetz@kdab.com>
Date: Tue, 23 Jun 2015 23:36:51 +0200
Subject: [PATCH 2/2] --graphviz: Enable support for utility dependencies and
 targets.

The former is now always on, but filtering for the latter is
possible. There really are other interesting dependencies than
just libraries.
---
 Modules/CMakeGraphVizOptions.cmake |  9 +++++
 Source/cmGraphVizWriter.cxx        | 76 +++++++++++++++++++++++---------------
 Source/cmGraphVizWriter.h          |  1 +
 3 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/Modules/CMakeGraphVizOptions.cmake b/Modules/CMakeGraphVizOptions.cmake
index ff18267..adb6fbd 100644
--- a/Modules/CMakeGraphVizOptions.cmake
+++ b/Modules/CMakeGraphVizOptions.cmake
@@ -87,6 +87,15 @@
 #  * Mandatory : NO
 #  * Default   : TRUE
 #
+# .. variable:: GRAPHVIZ_UTILITY_TARGETS
+#
+#  Set this to FALSE to exclude targets added with add_custom_target()
+#  and certain CMake internal helper targets. An example of the latter
+#  is checking build system files for changes before a build.
+#
+#  * Mandatory : NO
+#  * Default   : TRUE
+#
 # .. variable:: GRAPHVIZ_IGNORE_TARGETS
 #
 #  A list of regular expressions for ignoring targets.
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index fa29b4f..58cfaa7 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -53,6 +53,7 @@ cmGraphVizWriter::cmGraphVizWriter(const std::vector<cmLocalGenerator*>&
 ,GenerateForStaticLibs(true)
 ,GenerateForSharedLibs(true)
 ,GenerateForModuleLibs(true)
+,GenerateForUtilities(true)
 ,GenerateForExternals(true)
 ,GeneratePerTarget(true)
 ,GenerateDependers(true)
@@ -118,6 +119,7 @@ void cmGraphVizWriter::ReadSettings(const char* settingsFileName,
   __set_bool_if_set(this->GenerateForStaticLibs, "GRAPHVIZ_STATIC_LIBS");
   __set_bool_if_set(this->GenerateForSharedLibs, "GRAPHVIZ_SHARED_LIBS");
   __set_bool_if_set(this->GenerateForModuleLibs, "GRAPHVIZ_MODULE_LIBS");
+  __set_bool_if_set(this->GenerateForUtilities, "GRAPHVIZ_UTILITY_TARGETS");
   __set_bool_if_set(this->GenerateForExternals, "GRAPHVIZ_EXTERNAL_LIBS");
   __set_bool_if_set(this->GeneratePerTarget, "GRAPHVIZ_GENERATE_PER_TARGET");
   __set_bool_if_set(this->GenerateDependers, "GRAPHVIZ_GENERATE_DEPENDERS");
@@ -301,6 +303,29 @@ void cmGraphVizWriter::WriteFooter(cmGeneratedFileStream& str) const
 }
 
 
+static std::vector<std::string> dependencyNamesForTarget(const cmTarget *target)
+{
+   std::vector<std::string> ret;
+
+   const cmTarget::LinkLibraryVectorType &ll =
+                            target->GetOriginalLinkLibraries();
+   for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll.begin();
+        llit != ll.end(); ++llit)
+     {
+     ret.push_back(llit->first);
+     }
+
+   const std::set<cmLinkItem> &utilItems = target->GetUtilityItems();
+   for (std::set<cmLinkItem>::const_iterator utilIt = utilItems.begin();
+        utilIt != utilItems.end(); ++utilIt)
+     {
+     ret.push_back(*utilIt);
+     }
+
+   return ret;
+}
+
+
 void cmGraphVizWriter::WriteConnections(const std::string& targetName,
                                     std::set<std::string>& insertedNodes,
                                     std::set<std::string>& insertedConnections,
@@ -321,39 +346,32 @@ void cmGraphVizWriter::WriteConnections(const std::string& targetName,
     return;
     }
 
+  const std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
+  const std::vector<std::string> dependencyNames =
+                                dependencyNamesForTarget(targetPtrIt->second);
 
-  std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
-
-  const cmTarget::LinkLibraryVectorType* ll =
-                            &(targetPtrIt->second->GetOriginalLinkLibraries());
-
-  for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
-       llit != ll->end();
-       ++ llit )
+  for (std::vector<std::string>::const_iterator depIt = dependencyNames.begin();
+       depIt != dependencyNames.end(); ++depIt)
     {
-    const char* libName = llit->first.c_str();
-    std::map<std::string, std::string>::const_iterator libNameIt =
-                                          this->TargetNamesNodes.find(libName);
-
+    std::map<std::string, std::string>::const_iterator nodeNameIt =
+                                          this->TargetNamesNodes.find(*depIt);
     // can happen e.g. if GRAPHVIZ_TARGET_IGNORE_REGEX is used
-    if(libNameIt == this->TargetNamesNodes.end())
+    if(nodeNameIt == this->TargetNamesNodes.end())
       {
       continue;
       }
 
-    std::string connectionName = myNodeName;
-    connectionName += "-";
-    connectionName += libNameIt->second;
+    const std::string connectionName = myNodeName + "-" + nodeNameIt->second;
     if (insertedConnections.find(connectionName) == insertedConnections.end())
       {
       insertedConnections.insert(connectionName);
-      this->WriteNode(libName, this->TargetPtrs.find(libName)->second,
+      this->WriteNode(*depIt, this->TargetPtrs.find(*depIt)->second,
                       insertedNodes, str);
 
       str << "    \"" << myNodeName << "\" -> \""
-          << libNameIt->second << "\"";
-      str << " // " << targetName << " -> " << libName << std::endl;
-      this->WriteConnections(libName, insertedNodes, insertedConnections, str);
+          << nodeNameIt->second << "\"";
+      str << " // " << targetName << " -> " << *depIt << std::endl;
+      this->WriteConnections(*depIt, insertedNodes, insertedConnections, str);
       }
     }
 
@@ -399,17 +417,15 @@ void cmGraphVizWriter::WriteDependerConnections(const std::string& targetName,
       continue;
       }
 
-    // Now we have a target, check whether it links against targetName.
-    // If so, draw a connection, and then continue with dependers on that one.
-    const cmTarget::LinkLibraryVectorType* ll =
-                            &(dependerIt->second->GetOriginalLinkLibraries());
+    const std::vector<std::string> dependencyNames =
+                                dependencyNamesForTarget(dependerIt->second);
 
-    for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
-         llit != ll->end();
-         ++ llit )
+    // Now we have a target, check whether it depends on targetName.
+    // If so, draw a connection, and then continue with dependers on that one.
+    for (std::vector<std::string>::const_iterator depIt = dependencyNames.begin();
+         depIt != dependencyNames.end(); ++depIt)
       {
-      std::string libName = llit->first;
-      if (libName == targetName)
+      if (*depIt == targetName)
         {
         // So this target links against targetName.
         std::map<std::string, std::string>::const_iterator dependerNodeNameIt =
@@ -593,6 +609,8 @@ bool cmGraphVizWriter::GenerateForTargetType(cmTarget::TargetType targetType)
       return this->GenerateForSharedLibs;
     case cmTarget::MODULE_LIBRARY:
       return this->GenerateForModuleLibs;
+    case cmTarget::UTILITY:
+      return this->GenerateForUtilities;
     default:
       break;
   }
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index 64de684..9068d1f 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -81,6 +81,7 @@ protected:
   bool GenerateForStaticLibs;
   bool GenerateForSharedLibs;
   bool GenerateForModuleLibs;
+  bool GenerateForUtilities;
   bool GenerateForExternals;
   bool GeneratePerTarget;
   bool GenerateDependers;
-- 
2.1.4