diff --git a/NzbDrone.Core/MediaFiles/MediaFileService.cs b/NzbDrone.Core/MediaFiles/MediaFileService.cs
index c332ffeb7..45709fe8b 100644
--- a/NzbDrone.Core/MediaFiles/MediaFileService.cs
+++ b/NzbDrone.Core/MediaFiles/MediaFileService.cs
@@ -78,8 +78,10 @@ namespace NzbDrone.Core.MediaFiles
             string path = series.Path;
             if (series.SeasonFolder)
             {
-                //TODO: Allow series name
                 var seasonFolder = _configService.SortingSeasonFolderFormat
+                                                 .Replace("%sn", series.Title)
+                                                 .Replace("%s.n", series.Title.Replace(' ', '.'))
+                                                 .Replace("%s_n", series.Title.Replace(' ', '_'))
                                                  .Replace("%0s", seasonNumber.ToString("00"))
                                                  .Replace("%s", seasonNumber.ToString());
 
diff --git a/UI/Settings/Naming/NamingTemplate.html b/UI/Settings/Naming/NamingTemplate.html
index f00632a67..f2e819b76 100644
--- a/UI/Settings/Naming/NamingTemplate.html
+++ b/UI/Settings/Naming/NamingTemplate.html
@@ -113,7 +113,7 @@
             <div class="controls">
                 <input type="text" placeholder="Season %s" name="seasonFolderFormat"/>
             <span class="help-inline">
-                <i class="icon-question-sign" title="How should season folders be named? (Use %0s to pad to two digits)"/>
+                <i class="icon-question-sign" title="How should season folders be named? (Use %0s to pad to two digits, %sn for Series Name)"/>
             </span>
             </div>
         </div>