diff --git a/examples/Makefile b/examples/Makefile
index 8cb431d739..9f1615c2f0 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -9,6 +9,6 @@
 
 CLANG_LEVEL := ..
 
-PARALLEL_DIRS := clang-interpreter PrintFunctionNames
+PARALLEL_DIRS := clang-interpreter PrintFunctionNames Tooling
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/examples/Tooling/Makefile b/examples/Tooling/Makefile
index 66e86a03f1..4daa9c7f83 100644
--- a/examples/Tooling/Makefile
+++ b/examples/Tooling/Makefile
@@ -17,8 +17,10 @@ TOOL_NO_EXPORTS = 1
 
 LINK_COMPONENTS := support mc
 USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \
-           clangTooling.a clangSema.a clangAnalysis.a \
-           clangAST.a clangParse.a clangLex.a clangBasic.a
+           clangTooling.a clangParse.a clangSema.a clangAnalysis.a \
+           clangAST.a clangLex.a clangBasic.a
+
+PARALLEL_DIRS := RemoveCStrCalls
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/examples/Tooling/RemoveCStrCalls/Makefile b/examples/Tooling/RemoveCStrCalls/Makefile
new file mode 100644
index 0000000000..44de60ebe9
--- /dev/null
+++ b/examples/Tooling/RemoveCStrCalls/Makefile
@@ -0,0 +1,23 @@
+##===- examples/Tooling/RemoveCStrCalls/Makefile -----------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+CLANG_LEVEL := ../../..
+
+TOOLNAME = remove-cstr-calls
+NO_INSTALL = 1
+
+# No plugins, optimize startup time.
+TOOL_NO_EXPORTS = 1
+
+LINK_COMPONENTS := support mc
+USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
+           clangParse.a clangSema.a clangAnalysis.a \
+           clangAST.a clangLex.a clangBasic.a
+
+include $(CLANG_LEVEL)/Makefile