diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp
index bbb7f73d1f5..5f48a3a1536 100644
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -308,6 +308,12 @@ void DebuggerKitInformation::addToMacroExpander(Kit *kit, MacroExpander *expande
                                    const DebuggerItem *item = debugger(kit);
                                    return item ? item->engineTypeName() : tr("unknown");
                                });
+    // FIXME: Use better strings.
+    expander->registerVariable("Debugger:Name", tr("Debugger"),
+                               [this, kit]() -> QString {
+                                   const DebuggerItem *item = debugger(kit);
+                                   return item ? item->displayName() : tr("unknown");
+                               });
 }
 
 KitInformation::ItemList DebuggerKitInformation::toUserOutput(const Kit *k) const
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index 98878ef867d..68bd7131b33 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -208,6 +208,17 @@ void ToolChainKitInformation::addToEnvironment(const Kit *k, Utils::Environment
         tc->addToEnvironment(env);
 }
 
+void ToolChainKitInformation::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const
+{
+    // FIXME: Use better strings
+    expander->registerVariable("Compiler:Name", tr("Compiler"),
+                               [this, kit]() -> QString {
+                                   const ToolChain *tc = toolChain(kit);
+                                   return tc ? tc->displayName() : tr("None");
+                               });
+}
+
+
 IOutputParser *ToolChainKitInformation::createOutputParser(const Kit *k) const
 {
     ToolChain *tc = toolChain(k);
diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h
index cdaa7463dd7..75a71c6f892 100644
--- a/src/plugins/projectexplorer/kitinformation.h
+++ b/src/plugins/projectexplorer/kitinformation.h
@@ -93,6 +93,7 @@ public:
     ItemList toUserOutput(const Kit *k) const;
 
     void addToEnvironment(const Kit *k, Utils::Environment &env) const;
+    void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const;
     IOutputParser *createOutputParser(const Kit *k) const;
 
     static Core::Id id();