diff --git a/libcxx/include/version b/libcxx/include/version
index 09efcfc0e6454..8aa5fd4e7f0f8 100644
--- a/libcxx/include/version
+++ b/libcxx/include/version
@@ -1,4 +1,5 @@
-//===----------------------------------------------------------------------===//
+// -*- C++ -*-
+//===--------------------------- version ----------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/libcxx/utils/generate_feature_test_macro_components.py b/libcxx/utils/generate_feature_test_macro_components.py
index 5fef32b8529a0..f6527a97c6be9 100755
--- a/libcxx/utils/generate_feature_test_macro_components.py
+++ b/libcxx/utils/generate_feature_test_macro_components.py
@@ -821,8 +821,8 @@ def indent_to(s, val):
 
 
 def produce_version_header():
-  template="""
-//===----------------------------------------------------------------------===//
+  template="""// -*- C++ -*-
+//===--------------------------- version ----------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -853,7 +853,7 @@ def produce_version_header():
 // clang-format on
 
 #endif // _LIBCPP_VERSIONH
-"""[1:]
+"""
 
   version_str = template.format(
       synopsis=produce_version_synopsis().strip(),