diff --git a/.editorconfig b/.editorconfig
index 0e6c17e7674..98f07b3c5fb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,3 +5,7 @@ trim_trailing_whitespace = true
 
 [Makefile]
 trim_trailing_whitespace = true
+
+[src/hotspot/**.{cpp,hpp,h}]
+indent_style = space
+indent_size = 2
diff --git a/src/hotspot/.editorconfig b/src/hotspot/.editorconfig
deleted file mode 100644
index 48e63362b54..00000000000
--- a/src/hotspot/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[*.{cpp,hpp,c,h}]
-indent_style = space
-indent_size = 2