diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index e3629db41..061785c7e 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -844,12 +844,13 @@ namespace NzbDrone.Core.Organizer
             {
                 mediaInfoAudioLanguages = string.Format("[{0}]", mediaInfoAudioLanguages);
             }
-
+            var mediaInfoAudioLanguagesAll = mediaInfoAudioLanguages;
             if (mediaInfoAudioLanguages == "[EN]")
             {
                 mediaInfoAudioLanguages = string.Empty;
             }
 
+
             var mediaInfoSubtitleLanguages = GetLanguagesToken(movieFile.MediaInfo.Subtitles);
             if (!mediaInfoSubtitleLanguages.IsNullOrWhiteSpace())
             {
@@ -872,6 +873,9 @@ namespace NzbDrone.Core.Organizer
             tokenHandlers["{MediaInfo Simple}"] = m => string.Format("{0} {1}", videoCodec, audioCodec);
 
             tokenHandlers["{MediaInfo Full}"] = m => string.Format("{0} {1}{2} {3}", videoCodec, audioCodec, mediaInfoAudioLanguages, mediaInfoSubtitleLanguages);
+            tokenHandlers["{MediaInfo AudioLanguages}"] = m => mediaInfoAudioLanguages;
+            tokenHandlers["{MediaInfo AudioLanguagesAll}"] = m => mediaInfoAudioLanguagesAll;
+            tokenHandlers["{MediaInfo SubtitleLanguages}"] = m => mediaInfoSubtitleLanguages;
         }
 
         private string GetLanguagesToken(string mediaInfoLanguages)
diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/MediaInfoNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/MediaInfoNamingPartial.hbs
index 49203cafc..24d13bb9a 100644
--- a/src/UI/Settings/MediaManagement/Naming/Partials/MediaInfoNamingPartial.hbs
+++ b/src/UI/Settings/MediaManagement/Naming/Partials/MediaInfoNamingPartial.hbs
@@ -7,5 +7,14 @@
         <li><a href="#" data-token="MediaInfo Full">MediaInfo Full</a></li>
         <li><a href="#" data-token="MediaInfo.Full">MediaInfo.Full</a></li>
         <li><a href="#" data-token="MediaInfo_Full">MediaInfo_Full</a></li>
+        <li><a href="#" data-token="MediaInfo AudioLanguages">MediaInfo AudioLanguages</a></li>
+        <li><a href="#" data-token="MediaInfo.AudioLanguages">MediaInfo.AudioLanguages</a></li>
+        <li><a href="#" data-token="MediaInfo_AudioLanguages">MediaInfo_AudioLanguages</a></li>
+        <li><a href="#" data-token="MediaInfo AudioLanguagesAll">MediaInfo AudioLanguagesAll</a></li>
+        <li><a href="#" data-token="MediaInfo.AudioLanguagesAll">MediaInfo.AudioLanguagesAll</a></li>
+        <li><a href="#" data-token="MediaInfo_AudioLanguagesAll">MediaInfo_AudioLanguagesAll</a></li>
+        <li><a href="#" data-token="MediaInfo SubtitleLanguages">MediaInfo SubtitleLanguages</a></li>
+        <li><a href="#" data-token="MediaInfo.SubtitleLanguages">MediaInfo.SubtitleLanguages</a></li>
+        <li><a href="#" data-token="MediaInfo_SubtitleLanguages">MediaInfo_SubtitleLanguages</a></li>
     </ul>
 </li>