diff --git a/DiscImageChef.Gtk/DiscImageChef.Gtk.csproj b/DiscImageChef.Gtk/DiscImageChef.Gtk.csproj
index bf3f1d533..2565a7b1b 100644
--- a/DiscImageChef.Gtk/DiscImageChef.Gtk.csproj
+++ b/DiscImageChef.Gtk/DiscImageChef.Gtk.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>netcoreapp2.0</TargetFramework>
@@ -23,22 +23,23 @@
         <NrtShowRevision>true</NrtShowRevision>
     </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj"/>
-        <ProjectReference Include="..\DiscImageChef.Database\DiscImageChef.Database.csproj"/>
-        <ProjectReference Include="..\DiscImageChef.Gui\DiscImageChef.Gui.csproj"/>
-        <ProjectReference Include="..\DiscImageChef.Settings\DiscImageChef.Settings.csproj"/>
+        <ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj" />
+        <ProjectReference Include="..\DiscImageChef.Database\DiscImageChef.Database.csproj" />
+        <ProjectReference Include="..\DiscImageChef.Gui\DiscImageChef.Gui.csproj" />
+        <ProjectReference Include="..\DiscImageChef.Settings\DiscImageChef.Settings.csproj" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Eto.Platform.Gtk" Version="2.5.0-beta.1" />
         <PackageReference Include="GtkSharp" Version="3.22.24.37" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
+        <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
         <PackageReference Include="Unclassified.NetRevisionTask" Version="0.2.5" />
-        <PackageReference Include="System.Collections" Version="4.3.0"/>
-        <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0"/>
-        <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0"/>
-        <PackageReference Include="System.Runtime.Extensions" Version="4.3.0"/>
-        <PackageReference Include="System.Runtime.Handles" Version="4.3.0"/>
-        <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0"/>
+        <PackageReference Include="System.Collections" Version="4.3.0" />
+        <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
+        <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
+        <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
+        <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
+        <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
     </ItemGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
         <DebugSymbols>True</DebugSymbols>
@@ -105,10 +106,10 @@
         </Folder>
     </ItemGroup>
     <ItemGroup>
-        <None Include="..\.github\CODE_OF_CONDUCT.md"/>
+        <None Include="..\.github\CODE_OF_CONDUCT.md" />
     </ItemGroup>
     <ItemGroup>
-        <Content Include="..\.github\ISSUE_TEMPLATE.md"/>
-        <Content Include="..\.github\PULL_REQUEST_TEMPLATE.md"/>
+        <Content Include="..\.github\ISSUE_TEMPLATE.md" />
+        <Content Include="..\.github\PULL_REQUEST_TEMPLATE.md" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/DiscImageChef.Gtk/Program.cs b/DiscImageChef.Gtk/Program.cs
index 783da804a..b96d77d45 100644
--- a/DiscImageChef.Gtk/Program.cs
+++ b/DiscImageChef.Gtk/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reflection;
+using System.Text;
 using System.Threading.Tasks;
 using DiscImageChef.Core;
 using DiscImageChef.Database;
@@ -58,6 +59,8 @@ namespace DiscImageChef.Gtk
                         break;
                 }
 
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+
             new Application(Platforms.Gtk).Run(new frmMain(Debug, Verbose));
 
             Statistics.SaveStats();
diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj
index 402104a98..6a2ff5196 100644
--- a/DiscImageChef/DiscImageChef.csproj
+++ b/DiscImageChef/DiscImageChef.csproj
@@ -265,13 +265,14 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
     <PackageReference Include="Mono.Options" Version="5.3.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.2.5" />
-    <PackageReference Include="System.Collections" Version="4.3.0"/>
-    <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0"/>
-    <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0"/>
-    <PackageReference Include="System.Runtime.Extensions" Version="4.3.0"/>
-    <PackageReference Include="System.Runtime.Handles" Version="4.3.0"/>
-    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0"/>
+    <PackageReference Include="System.Collections" Version="4.3.0" />
+    <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
+    <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/DiscImageChef/Main.cs b/DiscImageChef/Main.cs
index 3f8fa42b3..f1991f337 100644
--- a/DiscImageChef/Main.cs
+++ b/DiscImageChef/Main.cs
@@ -33,6 +33,7 @@
 using System;
 using System.IO;
 using System.Reflection;
+using System.Text;
 using System.Threading.Tasks;
 using DiscImageChef.Commands;
 using DiscImageChef.CommonTypes.Interop;
@@ -95,6 +96,8 @@ namespace DiscImageChef
 
             PlatformID currentPlatform = DetectOS.GetRealPlatformID();
 
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+
             CommandSet commands = new CommandSet("DiscImageChef")
             {
                 $"{AssemblyTitle} {AssemblyVersion?.InformationalVersion}",