diff --git a/clang/lib/Frontend/FrontendOptions.cpp b/clang/lib/Frontend/FrontendOptions.cpp
--- a/clang/lib/Frontend/FrontendOptions.cpp
+++ b/clang/lib/Frontend/FrontendOptions.cpp
@@ -29,7 +29,7 @@
       .Case("cppm", Language::CXX)
       .Case("iim", InputKind(Language::CXX).getPreprocessed())
       .Case("cl", Language::OpenCL)
-      .Case("cu", Language::CUDA)
+      .Cases("cu", "cuh", Language::CUDA)
       .Case("hip", Language::HIP)
       .Cases("ll", "bc", Language::LLVM_IR)
       .Default(Language::Unknown);
diff --git a/clang/test/Parser/cuda-check-input-kind-assoc.cuh b/clang/test/Parser/cuda-check-input-kind-assoc.cuh
new file mode 100644
--- /dev/null
+++ b/clang/test/Parser/cuda-check-input-kind-assoc.cuh
@@ -0,0 +1,5 @@
+// RUN: %clang_cc1 -fsyntax-only -Werror %s
+
+// Check input kind association for cuh extension.
+
+__attribute__((host, device)) void hd_fn() {}