diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8555064ae..0f1c4ee4f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -972,6 +972,31 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable,
       return replaceValues.LinkLibraries;
       }
     }
+  if(replaceValues.Language)
+    {
+    if(variable == "LANGUAGE")
+      {
+      return replaceValues.Language;
+      }
+    }
+  if(replaceValues.CMTarget)
+    {
+    if(variable == "TARGET_NAME")
+      {
+      return replaceValues.CMTarget->GetName();
+      }
+    if(variable == "TARGET_TYPE")
+      {
+      return cmTarget::TargetTypeNames[replaceValues.CMTarget->GetType()];
+      }
+    }
+  if(replaceValues.Output)
+    {
+    if(variable == "OUTPUT")
+      {
+      return replaceValues.Output;
+      }
+    }
   if(variable == "CMAKE_COMMAND")
     {
     const char* cmcommand =
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index a624e66b3..10ec3b8a0 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -214,6 +214,7 @@ public:
     const char* Source;
     const char* AssemblySource;
     const char* PreprocessedSource;
+    const char* Output;
     const char* Object;
     const char* ObjectDir;
     const char* Flags;
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 3910bc137..a65d7c682 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1114,6 +1114,13 @@ cmLocalUnixMakefileGenerator3::MakeLauncher(const cmCustomCommand& cc,
   RuleVariables vars;
   vars.RuleLauncher = prop;
   vars.CMTarget = target;
+  std::string output;
+  const std::vector<std::string>& outputs = cc.GetOutputs();
+  if(!outputs.empty())
+    {
+    output = this->Convert(outputs[0].c_str(), relative, SHELL);
+    }
+  vars.Output = output.c_str();
 
   std::string launcher;
   this->ExpandRuleVariables(launcher, vars);