diff --git a/libcxx/.clang-format b/libcxx/.clang-format
--- a/libcxx/.clang-format
+++ b/libcxx/.clang-format
@@ -10,4 +10,11 @@
 # Disable formatting options which may break tests.
 SortIncludes: false
 ReflowComments: false
+
+# libc++ has some long names so we need more than the 80 column limit imposed by LLVM style, for sensible formatting
+ColumnLimit: 120
+
+# These aren't covered by the LLVM Style Guide
+BreakBeforeConceptDeclarations: true
+IndentRequires: false
 ---