diff --git a/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java b/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java
index 4c49cd48..e6e131d0 100644
--- a/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java
+++ b/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java
@@ -121,6 +121,7 @@ public class VoiceData
         new Voice("af",          "af",       "af",  "afr", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Afrikaans",                        "af",             "Hierdie is 'n voorbeeld van gesproke teks in Afrikaans"),
         new Voice("ak",          "test/ak",  "ak",  "aka", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Akan",                             "ak",             "This is a sample of text spoken in Akan"),
         new Voice("am",          "test/am",  "am",  "amh", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Amharic",                          "am",             "ይሄ በአማርኛ ላይ የተነገረ ጽሑፍ ናሙና ነው።"),
+        new Voice("an",          "test/an",  "an",  "arg", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Aragonese",                        "an",             "This is a sample of text spoken in Aragonese"),
         new Voice("az",          "test/az",  "az",  "aze", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Azerbaijani",                      "az",             "This is a sample of text spoken in Azerbaijani"),
         new Voice("bg",          "test/bg",  "bg",  "bul", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Bulgarian",                        "bg",             "Това е откъс от изговорен текст на български"),
         new Voice("bs",          "bs",       "bs",  "bos", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Bosnian",                          "bs",             "This is a sample of text spoken in Bosnian"),
@@ -143,6 +144,7 @@ public class VoiceData
         new Voice("es",          "es",       "es",  "spa", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Spanish",                          "es",             "Esto es un ejemplo de texto hablado en español."),
         new Voice("es-la",       "es-la",    "es",  "spa", "419", "",    "",         SpeechSynthesis.GENDER_MALE,        "Spanish (Latin America)",          "es-419",         "Esto es un ejemplo de texto hablado en español."),
         new Voice("et",          "et",       "et",  "est", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Estonian",                         "et",             "This is a sample of text spoken in eesti"),
+        new Voice("fa",          "test/fa",  "fa",  "fas", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Farsi (Persian)",                  "fa",             "این یک نمونه از نوشتار گفته شده در فارسی است"),
         new Voice("fi",          "fi",       "fi",  "fin", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Finnish",                          "fi",             "Tämä on näyte kielellä suomi puhutusta tekstistä"),
         new Voice("fr-be",       "fr-be",    "fr",  "fra", "BE",  "BEL", "",         SpeechSynthesis.GENDER_MALE,        "French (Belgium)",                 "fr-BE",          "Voici un exemple de texte énoncé en français (Belgique)."),
         new Voice("fr-fr",       "fr",       "fr",  "fra", "FR",  "FRA", "",         SpeechSynthesis.GENDER_MALE,        "French (France)",                  "fr-FR",          "Voici un exemple de texte énoncé en français (France)."),
diff --git a/android/res/raw/espeakdata.zip b/android/res/raw/espeakdata.zip
index df26a706..570b37ef 100644
Binary files a/android/res/raw/espeakdata.zip and b/android/res/raw/espeakdata.zip differ
diff --git a/android/res/raw/espeakdata_version b/android/res/raw/espeakdata_version
index 400bed71..9c79416c 100644
--- a/android/res/raw/espeakdata_version
+++ b/android/res/raw/espeakdata_version
@@ -1 +1 @@
-6c25c6e98920cc1cea220e8e8ed8069926d5cff5
+4e695c136cee4b53f2dd2e229dbc00a1c63b6d0e
diff --git a/android/src/com/reecedunn/espeak/SpeechSynthesis.java b/android/src/com/reecedunn/espeak/SpeechSynthesis.java
index a9afba84..3db1de24 100644
--- a/android/src/com/reecedunn/espeak/SpeechSynthesis.java
+++ b/android/src/com/reecedunn/espeak/SpeechSynthesis.java
@@ -110,7 +110,11 @@ public class SpeechSynthesis {
             final int gender = Integer.parseInt(results[i + 2]);
             final int age = Integer.parseInt(results[i + 3]);
             final Locale locale;
-            if (name.equals("en-sc")) {
+            if (name.equals("fa-pin")) {
+                // Android locales do not support scripts, so fa-Latn is not possible for Farsi Pinglish:
+                locale = null;
+            }
+            else if (name.equals("en-sc")) {
                 // 'SC' is not a country code.
                 locale = new Locale("en", "GB", "scotland");
             } else if (name.equals("en-wi")) {
@@ -319,6 +323,7 @@ public class SpeechSynthesis {
         mJavaToIanaLanguageCode.put("afr", "af");
         mJavaToIanaLanguageCode.put("aka", "ak");
         mJavaToIanaLanguageCode.put("amh", "am");
+        mJavaToIanaLanguageCode.put("arg", "an");
         mJavaToIanaLanguageCode.put("aze", "az");
         mJavaToIanaLanguageCode.put("bul", "bg");
         mJavaToIanaLanguageCode.put("bos", "bs");
@@ -333,6 +338,7 @@ public class SpeechSynthesis {
         mJavaToIanaLanguageCode.put("epo", "eo");
         mJavaToIanaLanguageCode.put("spa", "es");
         mJavaToIanaLanguageCode.put("est", "et");
+        mJavaToIanaLanguageCode.put("fas", "fa");
         mJavaToIanaLanguageCode.put("fin", "fi");
         mJavaToIanaLanguageCode.put("fra", "fr");
         mJavaToIanaLanguageCode.put("gle", "ga");