diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt
--- a/clang-tools-extra/clangd/CMakeLists.txt
+++ b/clang-tools-extra/clangd/CMakeLists.txt
@@ -218,3 +218,26 @@
 
 add_subdirectory(index/remote)
 add_subdirectory(index/dex/dexp)
+
+if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+  install(DIRECTORY .
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/clangd"
+    COMPONENT clangd-headers
+    FILES_MATCHING
+    PATTERN "*.h"
+    )
+  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+    COMPONENT clangd-headers
+    FILES_MATCHING
+    PATTERN "CMakeFiles" EXCLUDE
+    PATTERN "*.inc"
+    )
+  add_custom_target(clangd-headers)
+  set_target_properties(clangd-headers PROPERTIES FOLDER "Misc")
+  if(NOT LLVM_ENABLE_IDE)
+    add_llvm_install_targets(install-clangd-headers
+                             DEPENDS clangd-headers
+                             COMPONENT clangd-headers)
+  endif()
+endif()