diff --git a/clang/lib/Makefile b/clang/lib/Makefile
index bf357fc7d569..eda7017bb8bf 100755
--- a/clang/lib/Makefile
+++ b/clang/lib/Makefile
@@ -9,7 +9,8 @@
 CLANG_LEVEL := ..
 
 PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis \
-                StaticAnalyzer Rewrite Serialization Frontend FrontendTool Index Driver
+                StaticAnalyzer Rewrite Serialization Frontend FrontendTool \
+                Index Driver Tooling
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang/lib/Tooling/Makefile b/clang/lib/Tooling/Makefile
new file mode 100644
index 000000000000..501a00c3f4f4
--- /dev/null
+++ b/clang/lib/Tooling/Makefile
@@ -0,0 +1,15 @@
+##===- clang/lib/Tooling/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 := ../..
+LIBRARYNAME := clangTooling
+
+include $(CLANG_LEVEL)/Makefile
+
+