diff --git a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
index 7c54740de..a3eaed87a 100644
--- a/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
+++ b/frontend/src/Settings/MediaManagement/Naming/NamingModal.js
@@ -111,7 +111,8 @@ const trackTokens = [
 ];
 
 const releaseDateTokens = [
-  { token: '{Release Year}', example: '2016' }
+  { token: '{Release Year}', example: '2016' },
+  { token: '{Release Date}', example: '2016-01-31' }
 ];
 
 const trackTitleTokens = [
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 7609c6755..5bd7bd807 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -340,6 +340,10 @@ private void AddAlbumTokens(Dictionary<string, Func<TokenMatch, string>> tokenHa
             tokenHandlers["{Release Year}"] = album.ReleaseDate.HasValue
                 ? m => album.ReleaseDate.Value.Year.ToString()
                 : m => "Unknown";
+
+            tokenHandlers["{Release Date}"] = album.ReleaseDate.HasValue
+                ? m => album.ReleaseDate.Value.ToString("yyyy-MM-dd")
+                : m => "Unknown";
         }
 
         private void AddMediumTokens(Dictionary<string, Func<TokenMatch, string>> tokenHandlers, Medium medium)