diff --git a/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs b/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs
index c5c6059f8..c36d3f094 100644
--- a/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs
@@ -37,14 +37,12 @@ namespace NzbDrone.Core.Datastore.Migration
                         var qualityFormat = "[{Quality Title}]";
 
                         movieTitlePattern = "{Movie Title}";
-                        
-
-                        movieTitlePattern += " ";
 
-                        var standardMovieFormat = string.Format("{0}{1}", movieTitlePattern,
-                                                                                         qualityFormat);
+                        var standardMovieFormat = string.Format("{0} {1} {2}", movieTitlePattern, 
+                                                                             movieYearPattern,
+                                                                             qualityFormat);
 
-                        var movieFolderFormat = string.Format("{0}{1}", movieTitlePattern, movieYearPattern);
+                        var movieFolderFormat = string.Format("{0} {1}", movieTitlePattern, movieYearPattern);
                         
 
                         using (IDbCommand updateCmd = conn.CreateCommand())
diff --git a/src/NzbDrone.Core/Organizer/NamingConfig.cs b/src/NzbDrone.Core/Organizer/NamingConfig.cs
index 2ce3c64af..a617d5e61 100644
--- a/src/NzbDrone.Core/Organizer/NamingConfig.cs
+++ b/src/NzbDrone.Core/Organizer/NamingConfig.cs
@@ -14,8 +14,8 @@ namespace NzbDrone.Core.Organizer
             AnimeEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Quality Full}",
             SeriesFolderFormat = "{Series Title}",
             SeasonFolderFormat = "Season {season}",
-            MovieFolderFormat = "{Movie Title}",
-            StandardMovieFormat = "{Movie Title} {Quality Full}",
+            MovieFolderFormat = "{Movie Title} ({Release Year})",
+            StandardMovieFormat = "{Movie Title} ({Release Year}) {Quality Full}",
         };
 
         public bool RenameEpisodes { get; set; }