diff --git a/clang-tools-extra/Makefile b/clang-tools-extra/Makefile
index 7950470145bd..cf919a599d0a 100644
--- a/clang-tools-extra/Makefile
+++ b/clang-tools-extra/Makefile
@@ -11,7 +11,7 @@ CLANG_LEVEL := ../..
 
 include $(CLANG_LEVEL)/../../Makefile.config
 
-PARALLEL_DIRS := remove-cstr-calls tool-template
+PARALLEL_DIRS := remove-cstr-calls tool-template loop-convert
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang-tools-extra/loop-convert/Makefile b/clang-tools-extra/loop-convert/Makefile
new file mode 100644
index 000000000000..6dc8074c9132
--- /dev/null
+++ b/clang-tools-extra/loop-convert/Makefile
@@ -0,0 +1,25 @@
+##===- tools/extra/loop-convert/Makefile ----sssss----------*- 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 = loop-convert
+NO_INSTALL = 1
+
+# No plugins, optimize startup time.
+TOOL_NO_EXPORTS = 1
+
+include $(CLANG_LEVEL)/../../Makefile.config
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc
+USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
+					 clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
+					 clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
+
+include $(CLANG_LEVEL)/Makefile
+