diff --git a/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs
index 6601d4b3d..7d6bcabbd 100644
--- a/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs
@@ -131,6 +131,14 @@ public void should_parse_language_hindi(string postTitle)
             result.Languages.Should().BeEquivalentTo(Language.Hindi);
         }
 
+        [TestCase("Pulp.Fiction.1994.Thai.1080p.XviD-LOL")]
+        public void should_parse_language_thai(string postTitle)
+        {
+            var result = Parser.Parser.ParseMovieTitle(postTitle, true);
+
+            result.Languages.Should().BeEquivalentTo(Language.Thai);
+        }
+
         [TestCase("Pulp.Fiction.1994.Polish.1080p.XviD-LOL")]
         public void should_parse_language_polish(string postTitle)
         {
diff --git a/src/NzbDrone.Core/Languages/Language.cs b/src/NzbDrone.Core/Languages/Language.cs
index 73e3eeaaf..796d8ae22 100644
--- a/src/NzbDrone.Core/Languages/Language.cs
+++ b/src/NzbDrone.Core/Languages/Language.cs
@@ -98,6 +98,7 @@ public override bool Equals(object obj)
         public static Language Czech => new Language(25, "Czech");
         public static Language Hindi => new Language(26, "Hindi");
         public static Language Romanian => new Language(27, "Romanian");
+        public static Language Thai => new Language(28, "Thai");
         public static Language Any => new Language(-1, "Any");
         public static Language Original => new Language(-2, "Original");
 
@@ -135,6 +136,7 @@ public static List<Language> All
                     Czech,
                     Romanian,
                     Hindi,
+                    Thai,
                     Any,
                     Original
                 };
diff --git a/src/NzbDrone.Core/Parser/IsoLanguages.cs b/src/NzbDrone.Core/Parser/IsoLanguages.cs
index d82e867d6..8baad8219 100644
--- a/src/NzbDrone.Core/Parser/IsoLanguages.cs
+++ b/src/NzbDrone.Core/Parser/IsoLanguages.cs
@@ -33,6 +33,7 @@ public static class IsoLanguages
                                                                new IsoLanguage("he", "", "heb", "Hebrew", Language.Hebrew),
                                                                new IsoLanguage("cs", "", "ces", "Czech", Language.Czech),
                                                                new IsoLanguage("hi", "", "hin", "Hindi", Language.Hindi),
+                                                               new IsoLanguage("th", "", "tha", "Thai", Language.Thai),
                                                                new IsoLanguage("ro", "", "ron", "Romanian", Language.Romanian)
                                                            };
 
diff --git a/src/NzbDrone.Core/Parser/LanguageParser.cs b/src/NzbDrone.Core/Parser/LanguageParser.cs
index 49c89389b..03a2714c5 100644
--- a/src/NzbDrone.Core/Parser/LanguageParser.cs
+++ b/src/NzbDrone.Core/Parser/LanguageParser.cs
@@ -87,6 +87,11 @@ public static List<Language> ParseLanguages(string title)
                 languages.Add(Language.Hindi);
             }
 
+            if (lowerTitle.Contains("thai"))
+            {
+                languages.Add(Language.Thai);
+            }
+
             if (lowerTitle.Contains("polish"))
             {
                 languages.Add(Language.Polish);