diff --git a/libstdc++-v3/.editorconfig b/libstdc++-v3/.editorconfig
new file mode 100644
index 00000000000..88107cedda2
--- /dev/null
+++ b/libstdc++-v3/.editorconfig
@@ -0,0 +1,38 @@
+# top-most EditorConfig file for libstdc++-v3
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.h,*.cc]
+charset = utf-8
+indent_style = tab
+indent_size = 2
+tab_width = 8
+trim_trailing_whitespace = true
+
+[Makefile*,ChangeLog*]
+indent_style = tab
+indent_size = 8
+trim_trailing_whitespace = true
+
+[ChangeLog*]
+charset = utf-8
+
+[*.xml]
+charset = utf-8
+indent_size = 2
+tab_width = 8
+trim_trailing_whitespace = true
+
+[*.py]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.exp]
+indent_style = tab
+indent_size = 4
+tab_width = 8
+trim_trailing_whitespace = true
diff --git a/libstdc++-v3/include/std/.editorconfig b/libstdc++-v3/include/std/.editorconfig
new file mode 100644
index 00000000000..97ca1923cf8
--- /dev/null
+++ b/libstdc++-v3/include/std/.editorconfig
@@ -0,0 +1,10 @@
+# Inherit settings from EditorConfig files above this dir.
+root = false
+
+# All files under this directory are C++ headers.
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 2
+tab_width = 8
+trim_trailing_whitespace = true