diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 2a611d770..000000000
--- a/.editorconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-root = true
-
-[*]
-indent_size = 4
diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj
index 4b4265e85..8ea96a79a 100644
--- a/build/win32/Cxbx.vcxproj
+++ b/build/win32/Cxbx.vcxproj
@@ -376,8 +376,10 @@
     <None Include="..\..\CONTRIBUTORS" />
     <None Include="..\..\COPYING" />
     <None Include="..\..\README.md" />
+    <None Include="..\..\resource\.editorconfig" />
     <None Include="..\..\resource\Logo.bmp" />
     <None Include="..\..\resource\Splash.jpg" />
+    <None Include="..\..\src\.editorconfig" />
     <None Include="..\..\src\devices\video\EmuNV2A_DEBUG.cpp" />
     <None Include="..\..\src\devices\video\EmuNV2A_PBUS.cpp" />
     <None Include="..\..\src\devices\video\EmuNV2A_PCOUNTER.cpp" />
diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters
index 86fc7c02b..d1a85be21 100644
--- a/build/win32/Cxbx.vcxproj.filters
+++ b/build/win32/Cxbx.vcxproj.filters
@@ -627,6 +627,12 @@
     <None Include="..\..\src\devices\video\EmuNV2A_USER.cpp">
       <Filter>Hardware\Video</Filter>
     </None>
+    <None Include="..\..\src\.editorconfig">
+      <Filter>Code Format\src</Filter>
+    </None>
+    <None Include="..\..\resource\.editorconfig">
+      <Filter>Code Format\resource</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="GUI">
@@ -656,6 +662,15 @@
     <Filter Include="Hardware\X86">
       <UniqueIdentifier>{9efb9cfc-2731-4edb-8dd0-36950b0263df}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Code Format">
+      <UniqueIdentifier>{0e125cbe-fb2e-41ef-a381-6effd9fabd35}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Code Format\src">
+      <UniqueIdentifier>{26a58e10-09ca-4605-86f8-552e5a9aa2e3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Code Format\resource">
+      <UniqueIdentifier>{6bbc2463-25dc-4f07-bf9e-38d6216d036a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\resource\Cxbx.rc">
diff --git a/resource/.editorconfig b/resource/.editorconfig
new file mode 100644
index 000000000..5e333d675
--- /dev/null
+++ b/resource/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*.rc]
+indent_size = 4
+trim_trailing_whitespace = true
+end_of_line = crlf
+insert_final_newline = true
diff --git a/src/.editorconfig b/src/.editorconfig
new file mode 100644
index 000000000..f4a248305
--- /dev/null
+++ b/src/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_size = 4
+trim_trailing_whitespace = true
+end_of_line = crlf
+insert_final_newline = true