diff --git a/src/.editorconfig b/src/.editorconfig
new file mode 100644
index 00000000..dadc965c
--- /dev/null
+++ b/src/.editorconfig
@@ -0,0 +1,10 @@
+# indicate this is the root of the project
+root = true
+
+[*]
+trim_trailing_whitespace = true
+insert_final_newline = true
+# Of course the following is broken in VS2017 release.
+# Hopefully will be fixed with next update:
+# https://developercommunity.visualstudio.com/content/problem/22922/editorconfig-support-interprets-charset-utf-8-as-u.html
+#charset = utf-8
diff --git a/src/getopt/.clang/getopt.vcxproj b/src/getopt/.clang/getopt.vcxproj
index ae5ba27d..ca7cb7f5 100644
--- a/src/getopt/.clang/getopt.vcxproj
+++ b/src/getopt/.clang/getopt.vcxproj
@@ -153,9 +153,6 @@
   <ItemGroup>
     <ClInclude Include="..\getopt.h" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="ClassDiagram.cd" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/getopt/.clang/getopt.vcxproj.filters b/src/getopt/.clang/getopt.vcxproj.filters
index 58a2840f..2e23d852 100644
--- a/src/getopt/.clang/getopt.vcxproj.filters
+++ b/src/getopt/.clang/getopt.vcxproj.filters
@@ -23,7 +23,4 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="ClassDiagram.cd" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/getopt/.editorconfig b/src/getopt/.editorconfig
new file mode 100644
index 00000000..817bf043
--- /dev/null
+++ b/src/getopt/.editorconfig
@@ -0,0 +1,2 @@
+[*]
+tab_width = 8
diff --git a/src/getopt/.msvc/getopt.vcxproj b/src/getopt/.msvc/getopt.vcxproj
index 182eeb87..90b66fba 100644
--- a/src/getopt/.msvc/getopt.vcxproj
+++ b/src/getopt/.msvc/getopt.vcxproj
@@ -139,9 +139,6 @@
   <ItemGroup>
     <ClInclude Include="..\getopt.h" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="ClassDiagram.cd" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/getopt/.msvc/getopt.vcxproj.filters b/src/getopt/.msvc/getopt.vcxproj.filters
index 58a2840f..2e23d852 100644
--- a/src/getopt/.msvc/getopt.vcxproj.filters
+++ b/src/getopt/.msvc/getopt.vcxproj.filters
@@ -23,7 +23,4 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="ClassDiagram.cd" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libcdio/.editorconfig b/src/libcdio/.editorconfig
new file mode 100644
index 00000000..817bf043
--- /dev/null
+++ b/src/libcdio/.editorconfig
@@ -0,0 +1,2 @@
+[*]
+tab_width = 8
diff --git a/src/ms-sys/.editorconfig b/src/ms-sys/.editorconfig
new file mode 100644
index 00000000..817bf043
--- /dev/null
+++ b/src/ms-sys/.editorconfig
@@ -0,0 +1,2 @@
+[*]
+tab_width = 8
diff --git a/src/rufus.rc b/src/rufus.rc
index 2cb0bfd9..1cc5297c 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.13.1072"
+CAPTION "Rufus 2.13.1073"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -334,8 +334,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,13,1072,0
- PRODUCTVERSION 2,13,1072,0
+ FILEVERSION 2,13,1073,0
+ PRODUCTVERSION 2,13,1073,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -352,13 +352,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.13.1072"
+            VALUE "FileVersion", "2.13.1073"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.13.1072"
+            VALUE "ProductVersion", "2.13.1073"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/syslinux/.editorconfig b/src/syslinux/.editorconfig
new file mode 100644
index 00000000..2de03020
--- /dev/null
+++ b/src/syslinux/.editorconfig
@@ -0,0 +1,3 @@
+[*]
+indent_size = 4
+tab_width = 8