diff --git a/clang/runtime/libcxx/Makefile b/clang/runtime/libcxx/Makefile
index a65c906e8da3..a15fb522a6e9 100644
--- a/clang/runtime/libcxx/Makefile
+++ b/clang/runtime/libcxx/Makefile
@@ -15,7 +15,7 @@
 CLANG_LEVEL := ../..
 include $(CLANG_LEVEL)/Makefile
 
-PROJ_libcxx_hdrs := $(DESTDIR)$(PROJ_prefix)/lib/c++/v1
+PROJ_libcxx_hdrs := $(DESTDIR)$(PROJ_prefix)/lib
 
 # Expect libcxx to be in llvm/projects/libcxx
 LIBCXX_SRC_ROOT := $(LLVM_SRC_ROOT)/projects/libcxx
@@ -24,12 +24,8 @@ 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/*
+	$(MAKE) -C $(LIBCXX_SRC_ROOT) \
+	  HEADER_DIR=$(PROJ_libcxx_hdrs) do-installhdrs
 
 endif
 endif