diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index e53d805..68ee266 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 set(known_subdirs
   "compiler-rt"
+  "libcxx"
   )
 
 foreach (dir ${known_subdirs})
diff --git a/runtime/Makefile b/runtime/Makefile
index 784eb66..4b0625d 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -12,7 +12,7 @@
 
 ifndef NO_RUNTIME_LIBS
 
-PARALLEL_DIRS  := compiler-rt
+PARALLEL_DIRS  := compiler-rt libcxx
 
 endif
 
diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile
index 0d770db..8888556 100644
--- a/runtime/compiler-rt/Makefile
+++ b/runtime/compiler-rt/Makefile
@@ -1,4 +1,4 @@
-##===- clang/runtime/Makefile ------------------------------*- Makefile -*-===##
+##===- clang/runtime/compiler-rt/Makefile ------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
diff --git a/runtime/libcxx/Makefile b/runtime/libcxx/Makefile
new file mode 100644
index 0000000..a65c906
--- /dev/null
+++ b/runtime/libcxx/Makefile
@@ -0,0 +1,35 @@
+##===- clang/runtime/libcxx/Makefile -----------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+#
+# This file defines support for installing a copy of the libcxx headers where
+# the driver expects them.
+#
+##===----------------------------------------------------------------------===##
+
+CLANG_LEVEL := ../..
+include $(CLANG_LEVEL)/Makefile
+
+PROJ_libcxx_hdrs := $(DESTDIR)$(PROJ_prefix)/lib/c++/v1
+
+# Expect libcxx to be in llvm/projects/libcxx
+LIBCXX_SRC_ROOT := $(LLVM_SRC_ROOT)/projects/libcxx
+
+ifneq ($(CLANG_NO_RUNTIME),1)
+ifeq ($(shell test -d $(LIBCXX_SRC_ROOT) && echo OK),OK)
+
+install-local::
+	mkdir -p $(PROJ_libcxx_hdrs)/ext
+	rsync -r --exclude=".*" $(LIBCXX_SRC_ROOT)/include/* $(PROJ_libcxx_hdrs)
+	chmod 755 $(PROJ_libcxx_hdrs)
+	chmod 644 $(PROJ_libcxx_hdrs)/*
+	chmod 755 $(PROJ_libcxx_hdrs)/ext
+	chmod 644 $(PROJ_libcxx_hdrs)/ext/*
+
+endif
+endif