diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31274dc4b..5713cb2d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -270,6 +270,7 @@ add_definitions(
 #===============================================================================
 
 include_directories(include)
+add_subdirectory(include)
 
 # Add source code. This also contains all of the logic for deciding linker flags
 # soname, etc...
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 9f28f68b9..cec0bee14 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -99,16 +99,3 @@ install(TARGETS cxx
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
   )
-
-
-if (NOT LIBCXX_INSTALL_SUPPORT_HEADERS)
-  set(LIBCXX_SUPPORT_HEADER_PATTERN PATTERN "support" EXCLUDE)
-endif()
-
-install(DIRECTORY ../include/
-  DESTINATION include/c++/v1
-  FILES_MATCHING
-  PATTERN "*"
-  PATTERN ".svn" EXCLUDE
-  ${LIBCXX_SUPPORT_HEADER_PATTERN}
-  )