diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 2c899630e4..f705b68035 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -41,7 +41,7 @@ public class FileNameBuilder : IBuildFileNames
         private static readonly Regex TitleRegex = new Regex(@"(?<tag>\{(?<prefix>[-{ ._\[(]*)(?:imdb(?:id)?-|edition-))?\{(?<prefix>[-{ ._\[(]*)(?<token>(?:[a-z0-9]+)(?:(?<separator>[- ._]+)(?:[a-z0-9]+))?)(?::(?<customFormat>[ ,a-z0-9|+-]+(?<![- ])))?(?<suffix>[-} ._)\]]*)\}",
                                                              RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
 
-        public static readonly Regex ReleaseYearRegex = new Regex(@"\{[\[\(]?Release[- ._]Year[\]\)]?\}", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        public static readonly Regex ReleaseYearRegex = new Regex(@"\{[-{ ._\[(]*Release[- ._]Year[-} ._)\]]*\}", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         public static readonly Regex MovieTitleRegex = new Regex(@"(?<token>\{(?:Movie)(?<separator>[- ._])(?:Clean)?(?:OriginalTitle|Title(?:The)?)(?::(?<customFormat>[a-z0-9|-]+))?\})",
                                                                             RegexOptions.Compiled | RegexOptions.IgnoreCase);
diff --git a/src/NzbDrone.Integration.Test/ApiTests/NamingConfigFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/NamingConfigFixture.cs
index fb85bbacfa..65bcf5a210 100644
--- a/src/NzbDrone.Integration.Test/ApiTests/NamingConfigFixture.cs
+++ b/src/NzbDrone.Integration.Test/ApiTests/NamingConfigFixture.cs
@@ -23,6 +23,11 @@ public void should_be_able_to_get_by_id()
         [TestCase("{Movie Title} {Release Year}")]
         [TestCase("{Movie Title} {(Release Year)}")]
         [TestCase("{Movie Title} {[Release Year]}")]
+        [TestCase("{Movie Title} {{Release Year}}")]
+        [TestCase("{Movie Title}{ Release Year }")]
+        [TestCase("{Movie-Title}{-Release-Year-}")]
+        [TestCase("{Movie_Title}{_Release_Year_}")]
+        [TestCase("{Movie.Title}{.Release.Year.}")]
         public void should_be_able_to_update(string standardMovieFormat)
         {
             var config = NamingConfig.GetSingle();