diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index 4c4239b045af..dfdd13c36bc0 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -157,15 +157,7 @@ if( CMAKE_CROSSCOMPILING )
   include( CrossCompileLLVM )
 endif( CMAKE_CROSSCOMPILING )
 
-add_custom_command(OUTPUT ${llvm_builded_incs_dir}/Intrinsics.gen
-  COMMAND ${LLVM_TABLEGEN} -gen-intrinsic -I ${LLVM_MAIN_INCLUDE_DIR} ${LLVM_MAIN_INCLUDE_DIR}/llvm/Intrinsics.td -o ${llvm_builded_incs_dir}/Intrinsics.gen
-  DEPENDS tblgen
-  COMMENT "Building intrinsics.gen...")
-
-add_custom_target(intrinsics_gen ALL
-  DEPENDS ${llvm_builded_incs_dir}/Intrinsics.gen)
-
-set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} intrinsics_gen )
+add_subdirectory(include/llvm)
 
 add_subdirectory(lib/VMCore)
 add_subdirectory(lib/CodeGen)
diff --git a/llvm/include/llvm/CMakeLists.txt b/llvm/include/llvm/CMakeLists.txt
new file mode 100644
index 000000000000..523f23127789
--- /dev/null
+++ b/llvm/include/llvm/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(LLVM_TARGET_DEFINITIONS Intrinsics.td)
+
+tablegen(Intrinsics.gen -gen-intrinsic)
+
+add_custom_target(intrinsics_gen ALL
+  DEPENDS ${llvm_builded_incs_dir}/Intrinsics.gen)
+
+set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} intrinsics_gen PARENT_SCOPE)