diff --git a/src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK/Kajabity.Tools.Java/JavaProperties.cs b/src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK/Kajabity.Tools.Java/JavaProperties.cs
index 49c1579a083..177bcb03d7f 100644
--- a/src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK/Kajabity.Tools.Java/JavaProperties.cs
+++ b/src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK/Kajabity.Tools.Java/JavaProperties.cs
@@ -35,9 +35,9 @@ namespace Kajabity.Tools.Java
public class JavaProperties: Hashtable
{
///
- /// Gets a reference to the ISO-8859-1 encoding (code page 28592). This is the Java standard for .properties files.
+ /// Gets a reference to the ISO-8859-1 encoding (code page 28591). This is the Java standard for .properties files.
///
- internal static Encoding DefaultEncoding { get { return Encoding.GetEncoding( 28592 ); } }
+ internal static Encoding DefaultEncoding { get { return Encoding.GetEncoding( 28591 ); } }
///
/// A reference to an optional set of default properties - these values are returned
diff --git a/src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK/Kajabity.Tools.Java/JavaPropertyReader.cs b/src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK/Kajabity.Tools.Java/JavaPropertyReader.cs
index b0c55ed9153..3e66a7829be 100644
--- a/src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK/Kajabity.Tools.Java/JavaPropertyReader.cs
+++ b/src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK/Kajabity.Tools.Java/JavaPropertyReader.cs
@@ -303,7 +303,7 @@ public void Parse( Stream stream )
public void Parse( Stream stream, Encoding encoding )
{
var bufferedStream = new BufferedStream( stream, bufferSize );
- // the default encoding ISO-8859-1 (codepabe 28592) will be used if we do not pass explicitly different encoding
+ // the default encoding ISO-8859-1 (code page 28591) will be used if we do not pass explicitly different encoding
var parserEncoding = encoding ?? JavaProperties.DefaultEncoding;
reader = new BinaryReader( bufferedStream, parserEncoding );
diff --git a/src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK/Kajabity.Tools.Java/JavaPropertyWriter.cs b/src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK/Kajabity.Tools.Java/JavaPropertyWriter.cs
index a6dffc00dbe..b4b67e2dfba 100644
--- a/src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK/Kajabity.Tools.Java/JavaPropertyWriter.cs
+++ b/src/Xamarin.Installer.AndroidSDK/Xamarin.Installer.AndroidSDK/Kajabity.Tools.Java/JavaPropertyWriter.cs
@@ -52,13 +52,8 @@ public JavaPropertyWriter( Hashtable hashtable )
/// Optional comments that are placed at the beginning of the output.
public void Write( Stream stream, string comments )
{
- // Create a writer to output to an ISO-8859-1 encoding (code page 28592).
- StreamWriter writer = new StreamWriter( stream, System.Text.Encoding.GetEncoding( 28592 ) );
-
- //TODO: Confirm correct codepage:
- // 28592 iso-8859-2 Central European (ISO)
- // 28591 iso-8859-1 Western European (ISO)
- // from http://msdn.microsoft.com/en-us/library/system.text.encodinginfo.getencoding.aspx
+ // Create a writer to output to an ISO-8859-1 encoding (code page 28591).
+ StreamWriter writer = new StreamWriter( stream, JavaProperties.DefaultEncoding );
if( comments != null)
{