diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000..0e6c17e76740d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*.{cpp,hpp,c,h,java,cc,hh,m,mm,S,md,properties,gmk,m4,ac}]
+trim_trailing_whitespace = true
+
+[Makefile]
+trim_trailing_whitespace = true
diff --git a/src/hotspot/.editorconfig b/src/hotspot/.editorconfig
new file mode 100644
index 0000000000000..48e63362b542e
--- /dev/null
+++ b/src/hotspot/.editorconfig
@@ -0,0 +1,3 @@
+[*.{cpp,hpp,c,h}]
+indent_style = space
+indent_size = 2