diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog
index 97d4b4b7..b4be9097 100644
--- a/DiscImageChef/ChangeLog
+++ b/DiscImageChef/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-02  Natalia Portillo  <claunia@claunia.com>
+
+	* Checksums/CRC16Context.cs:
+	  Corrected poly, solved endian problem
+
 2014-04-21  Natalia Portillo  <claunia@claunia.com>
 
 	* ImagePlugins/TeleDisk.cs:
diff --git a/DiscImageChef/Checksums/CRC16Context.cs b/DiscImageChef/Checksums/CRC16Context.cs
index 1dcdaed2..d59eb18b 100644
--- a/DiscImageChef/Checksums/CRC16Context.cs
+++ b/DiscImageChef/Checksums/CRC16Context.cs
@@ -46,8 +46,8 @@ namespace DiscImageChef.Checksums
     /// </summary>
     public class CRC16Context
     {
-        const UInt16 crc16Poly = 0x8408;
-        const UInt16 crc16Seed = 0xFFFF;
+        const UInt16 crc16Poly = 0xA001;
+        const UInt16 crc16Seed = 0x0000;
 
         UInt16[] table;
         UInt16 hashInt;
@@ -80,7 +80,7 @@ namespace DiscImageChef.Checksums
         public void Update(byte[] data, uint len)
         {
             for (int i = 0; i < len; i++)
-                hashInt = (ushort)((hashInt >> 8) ^ table[data[i] ^ hashInt & 0xff]);
+                hashInt = (ushort)((hashInt >> 8) ^ table[data[i] ^ (hashInt & 0xFF)]);
         }
 
         /// <summary>
@@ -98,6 +98,7 @@ namespace DiscImageChef.Checksums
         public byte[] Final()
         {
             hashInt ^= crc16Seed;
+            BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
             return BigEndianBitConverter.GetBytes(hashInt);
         }
 
@@ -109,6 +110,7 @@ namespace DiscImageChef.Checksums
             hashInt ^= crc16Seed;
             StringBuilder crc16Output = new StringBuilder();
 
+            BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
             for (int i = 0; i < BigEndianBitConverter.GetBytes(hashInt).Length; i++)
             {
                 crc16Output.Append(BigEndianBitConverter.GetBytes(hashInt)[i].ToString("x2"));
@@ -156,7 +158,8 @@ namespace DiscImageChef.Checksums
             for (int i = 0; i < fileStream.Length; i++)
                 localhashInt = (ushort)((localhashInt >> 8) ^ localTable[fileStream.ReadByte() ^ localhashInt & 0xff]);
 
-            hash = BitConverter.GetBytes(localhashInt);
+            BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
+            hash = BigEndianBitConverter.GetBytes(localhashInt);
 
             StringBuilder crc16Output = new StringBuilder();
 
@@ -209,7 +212,8 @@ namespace DiscImageChef.Checksums
             for (int i = 0; i < len; i++)
                 localhashInt = (ushort)((localhashInt >> 8) ^ localTable[data[i] ^ localhashInt & 0xff]);
 
-            hash = BitConverter.GetBytes(localhashInt);
+            BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
+            hash = BigEndianBitConverter.GetBytes(localhashInt);
 
             StringBuilder crc16Output = new StringBuilder();