diff --git a/Modules/Dart.cmake b/Modules/Dart.cmake
index 288a085e6..853d5d1b1 100644
--- a/Modules/Dart.cmake
+++ b/Modules/Dart.cmake
@@ -47,9 +47,6 @@ IF(BUILD_TESTING)
   # find a tcl shell command
   INCLUDE(${CMAKE_ROOT}/Modules/FindTclsh.cmake)
 
-  FIND_PROGRAM(HOSTNAME hostname /usr/bsd /usr/sbin /usr/bin /bin /sbin)
-  FIND_PROGRAM(NSLOOKUP nslookup /usr/bin /usr/sbin /usr/local/bin)
-
   # set the site name
   SITE_NAME(SITE)
   # set the build name
@@ -64,8 +61,6 @@ IF(BUILD_TESTING)
     SITE 
     BUILDNAME 
     MAKECOMMAND 
-    HOSTNAME 
-    NSLOOKUP 
     JAVACOMMAND 
     PURIFYCOMMAND
     GUNZIPCOMMAND
diff --git a/Source/cmSiteNameCommand.cxx b/Source/cmSiteNameCommand.cxx
index f91599a1f..5a66a9fb8 100644
--- a/Source/cmSiteNameCommand.cxx
+++ b/Source/cmSiteNameCommand.cxx
@@ -44,9 +44,17 @@ bool cmSiteNameCommand::InitialPass(std::vector<std::string> const& args)
     }
   
   std::string siteName = "unknown";
-  
+#if defined(_WIN32) && !defined(__CYGWIN__)
+  std::string host;
+  if(cmSystemTools::ReadRegistryValue(
+    "HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\ComputerName\\ComputerName;ComputerName",
+    host))
+    {
+    siteName = host;
+    }
+#else
   // try to find the hostname for this computer
-  if (hostname_cmd.length()) 
+  if (!cmSystemTools::IsOff(hostname_cmd.c_str()))
     {
     std::string host;
     cmSystemTools::RunCommand(hostname_cmd.c_str(),
@@ -80,7 +88,7 @@ bool cmSiteNameCommand::InitialPass(std::vector<std::string> const& args)
           }
 
         // try to find the domain name for this computer
-        if (nslookup_cmd.length())
+        if (!cmSystemTools::IsOff(nslookup_cmd.c_str()))
           {
           nslookup_cmd += " ";
           nslookup_cmd += host;
@@ -104,7 +112,7 @@ bool cmSiteNameCommand::InitialPass(std::vector<std::string> const& args)
         }
       }
     }
-  
+#endif
   m_Makefile->
     AddCacheDefinition(args[0].c_str(),
                        siteName.c_str(),