diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 12ea2aa9fb..e3da531011 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -7,4 +7,5 @@ add_subdirectory(Sema)
 add_subdirectory(CodeGen)
 add_subdirectory(Analysis)
 add_subdirectory(Rewrite)
+add_subdirectory(Driver)
 add_subdirectory(Frontend)
diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt
index bd4c9fde76..7147d8f0be 100644
--- a/lib/Driver/CMakeLists.txt
+++ b/lib/Driver/CMakeLists.txt
@@ -7,8 +7,13 @@ add_clang_library(clangDriver
   Compilation.cpp
   Driver.cpp
   HostInfo.cpp
+  Job.cpp
   OptTable.cpp
   Option.cpp
   Phases.cpp
+  Tool.cpp
+  ToolChain.cpp
+  ToolChains.cpp
+  Tools.cpp
   Types.cpp
   )
diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
index 2ff67953f7..680a9a8fc9 100644
--- a/lib/Frontend/CMakeLists.txt
+++ b/lib/Frontend/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_NO_RTTI 1)
 
-add_clang_library(clangDriver
+add_clang_library(clangFrontend
   HTMLDiagnostics.cpp
   InitHeaderSearch.cpp
   TextDiagnosticBuffer.cpp
diff --git a/tools/clang-cc/CMakeLists.txt b/tools/clang-cc/CMakeLists.txt
index 9dd596c2ce..70e260a856 100644
--- a/tools/clang-cc/CMakeLists.txt
+++ b/tools/clang-cc/CMakeLists.txt
@@ -5,7 +5,7 @@ set( LLVM_USED_LIBS
   clangAnalysis
   clangRewrite
   clangSema
-  clangDriver
+  clangFrontend
   clangAST
   clangParse
   clangLex
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index b2bc0bdb2f..fc7464afe0 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(LLVM_NO_RTTI 1)
+
 set( LLVM_USED_LIBS
   clangDriver
   clangBasic
@@ -5,6 +7,6 @@ set( LLVM_USED_LIBS
 
 set(LLVM_LINK_COMPONENTS system support bitreader bitwriter)
 
-add_clang_tool(clang
+add_clang_executable(clang
   driver.cpp
   )