diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4effaf727c4..d900471d570 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -19,6 +19,7 @@ set(LLVM_TEST_DEPENDS
           LLVMHello
           llc
           lli
+          lli-child-target
           llvm-ar
           llvm-as
           llvm-bcanalyzer
@@ -28,7 +29,7 @@ set(LLVM_TEST_DEPENDS
           llvm-extract
           llvm-dwarfdump
           llvm-link
-	   llvm-lto
+          llvm-lto
           llvm-mc
           llvm-mcmarkup
           llvm-nm
diff --git a/tools/lli/ChildTarget/LLVMBuild.txt b/tools/lli/ChildTarget/LLVMBuild.txt
new file mode 100644
index 00000000000..daf6df11324
--- /dev/null
+++ b/tools/lli/ChildTarget/LLVMBuild.txt
@@ -0,0 +1,21 @@
+;===- ./tools/lli/ChildTarget/LLVMBuild.txt --------------------*- Conf -*--===;
+;
+;                     The LLVM Compiler Infrastructure
+;
+; This file is distributed under the University of Illinois Open Source
+; License. See LICENSE.TXT for details.
+;
+;===------------------------------------------------------------------------===;
+;
+; This is an LLVMBuild description file for the components in this subdirectory.
+;
+; For more information on the LLVMBuild system, please see:
+;
+;   http://llvm.org/docs/LLVMBuild.html
+;
+;===------------------------------------------------------------------------===;
+
+[component_0]
+type = Tool
+name = lli-child-target
+parent = lli
diff --git a/tools/lli/LLVMBuild.txt b/tools/lli/LLVMBuild.txt
index c96a9e80ece..aab2a208dee 100644
--- a/tools/lli/LLVMBuild.txt
+++ b/tools/lli/LLVMBuild.txt
@@ -15,6 +15,9 @@
 ;
 ;===------------------------------------------------------------------------===;
 
+[common]
+subdirectories = ChildTarget
+
 [component_0]
 type = Tool
 name = lli