diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 4ce932240..673762de3 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -533,8 +533,8 @@ void cmMakefile::GenerateCacheOnly()
 void cmMakefile::AddDefaultDefinitions()
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
-  this->AddDefinition("CMAKE_CFG","$(CFG)");
+  this->AddDefinition("CMAKE_CFG_OUTDIR","$(OUTDIR)");
 #else
-  this->AddDefinition("CMAKE_CFG",".");
+  this->AddDefinition("CMAKE_CFG_OUTDIR",".");
 #endif
 }
diff --git a/Source/cmUtilitySourceCommand.cxx b/Source/cmUtilitySourceCommand.cxx
index 0a8c9b75d..32506d08a 100644
--- a/Source/cmUtilitySourceCommand.cxx
+++ b/Source/cmUtilitySourceCommand.cxx
@@ -62,10 +62,10 @@ bool cmUtilitySourceCommand::Invoke(std::vector<std::string>& args)
   
   // The source exists.  Construct the cache entry for the executable's
   // location.
-  std::string cmakeCFG = m_Makefile->GetDefinition("CMAKE_CFG");
+  std::string cmakeCFGout = m_Makefile->GetDefinition("CMAKE_CFG_OUTDIR");
   std::string utilityExecutable = m_Makefile->GetCurrentOutputDirectory();
   utilityExecutable =
-    (utilityExecutable+"/"+relativeSource+"/"+cmakeCFG+"/"
+    (utilityExecutable+"/"+relativeSource+"/"+cmakeCFGout+"/"
      +utilityName+cmSystemTools::GetExecutableExtension());
   
   // Enter the value into the cache.