diff --git a/exeinfo/exeinfo.csproj b/exeinfo/exeinfo.csproj
index 1248876..311bbf0 100644
--- a/exeinfo/exeinfo.csproj
+++ b/exeinfo/exeinfo.csproj
@@ -30,8 +30,8 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Claunia.Encoding, Version=1.4.6570.38892, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Claunia.Encoding.1.4.0\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
+    <Reference Include="Claunia.Encoding, Version=1.4.6634.5461, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Claunia.Encoding.1.5.0\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
diff --git a/exeinfo/packages.config b/exeinfo/packages.config
index 2e764ff..ac08640 100644
--- a/exeinfo/packages.config
+++ b/exeinfo/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Claunia.Encoding" version="1.4.0" targetFramework="net461" />
+  <package id="Claunia.Encoding" version="1.5.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/exeinfogui/exeinfogui.csproj b/exeinfogui/exeinfogui.csproj
index b73926c..a023c6d 100644
--- a/exeinfogui/exeinfogui.csproj
+++ b/exeinfogui/exeinfogui.csproj
@@ -8,7 +8,7 @@
     <Description>Description of exeinfogui</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Claunia.Encoding" Version="1.4.0" />
+    <PackageReference Include="Claunia.Encoding" Version="1.5.0" />
     <PackageReference Include="Eto.Forms" Version="2.4.1" />
     <PackageReference Include="Eto.Serialization.Xaml" Version="2.4.1" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
diff --git a/libexeinfo/MZ/MZ.cs b/libexeinfo/MZ/MZ.cs
index dc342d5..21a91b0 100644
--- a/libexeinfo/MZ/MZ.cs
+++ b/libexeinfo/MZ/MZ.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
+using Claunia.Encoding;
 
 namespace libexeinfo
 {
@@ -122,15 +122,7 @@ namespace libexeinfo
             Recognized = false;
             if(BaseStream == null) return;
 
-            byte[]   buffer = new byte[Marshal.SizeOf(typeof(MZHeader))];
-            Encoding encoding;
-
-            try { encoding = Encoding.GetEncoding("ibm850"); }
-            catch
-            {
-                try { encoding   = Encoding.GetEncoding("ibm850"); }
-                catch { encoding = Encoding.ASCII; }
-            }
+            byte[] buffer = new byte[Marshal.SizeOf(typeof(MZHeader))];
 
             BaseStream.Position = 0;
             BaseStream.Read(buffer, 0, buffer.Length);
@@ -171,7 +163,8 @@ namespace libexeinfo
                 ResourceStream.Read(buffer, 0, buffer.Length);
                 ResourceExtension = BigEndianMarshal.ByteArrayToStructureLittleEndian<GEM.GemResourceExtension>(buffer);
 
-                GemColorIcons = GEM.GetColorIcons(ResourceStream, ResourceExtension.color_ic, false, encoding);
+                GemColorIcons =
+                    GEM.GetColorIcons(ResourceStream, ResourceExtension.color_ic, false, Encoding.GemEncoding);
             }
 
             List<string> strings = new List<string>();
@@ -208,7 +201,8 @@ namespace libexeinfo
 
                     List<short> knownNodes = new List<short>();
                     ResourceObjectRoots[i] =
-                        GEM.ProcessResourceObject(nodes, ref knownNodes, 0, ResourceStream, strings, false, encoding);
+                        GEM.ProcessResourceObject(nodes, ref knownNodes, 0, ResourceStream, strings, false,
+                                                  Encoding.GemEncoding);
                 }
             }
             else if(ResourceHeader.rsh_nobs > 0)
@@ -227,7 +221,8 @@ namespace libexeinfo
                 ResourceObjectRoots    = new GEM.TreeObjectNode[1];
                 // TODO: Correct encoding?
                 ResourceObjectRoots[0] =
-                    GEM.ProcessResourceObject(nodes, ref knownNodes, 0, ResourceStream, strings, false, encoding);
+                    GEM.ProcessResourceObject(nodes, ref knownNodes, 0, ResourceStream, strings, false,
+                                              Encoding.GemEncoding);
             }
 
             if(strings.Count > 0)
diff --git a/libexeinfo/libexeinfo.csproj b/libexeinfo/libexeinfo.csproj
index 397df8f..16aad4b 100644
--- a/libexeinfo/libexeinfo.csproj
+++ b/libexeinfo/libexeinfo.csproj
@@ -40,8 +40,8 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Claunia.Encoding, Version=1.4.6570.38892, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Claunia.Encoding.1.4.0\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
+    <Reference Include="Claunia.Encoding, Version=1.4.6634.5461, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Claunia.Encoding.1.5.0\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
diff --git a/libexeinfo/packages.config b/libexeinfo/packages.config
index b3936d8..ae611d7 100644
--- a/libexeinfo/packages.config
+++ b/libexeinfo/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Claunia.Encoding" version="1.4.0" targetFramework="net46" />
+  <package id="Claunia.Encoding" version="1.5.0" targetFramework="net46" />
   <package id="NuGet.Build.Packaging" version="0.1.276" targetFramework="net46" developmentDependency="true" />
   <package id="System.ValueTuple" version="4.4.0" targetFramework="net46" />
 </packages>
\ No newline at end of file