diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index cba1b2d7..c78c7f07 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -1402,6 +1402,10 @@
                                     <label><input type="checkbox" title="Automatically mark manually added albums from search results as wanted"
                                            name="autowant_manually_added" value="1" ${config['autowant_manually_added']} />Automatically mark manually added albums as wanted</label>
                                 </div>
+                                <div class="row checkbox left clearfix nopad">
+                                    <label><input type="checkbox" title="Wait until album release date before searching"
+                                           name="wait_until_release_date" value="1" ${config['wait_until_release_date']} />Wait until an album's release date before searching</label>
+                                </div>
                                 <div class="row checkbox left clearfix nopad">
                                     <label title="Freeze the database, so new artists won't be added automatically. Use this if Headphones adds artists because due to wrong snatches. This check is skipped when the folder name is appended with release group ID.">
                                         Don't add new artists when post-processing albums
diff --git a/headphones/config.py b/headphones/config.py
index dec8c741..d405a723 100644
--- a/headphones/config.py
+++ b/headphones/config.py
@@ -242,6 +242,7 @@ _CONFIG_DEFINITIONS = {
     'UTORRENT_PASSWORD': (str, 'uTorrent', ''),
     'UTORRENT_USERNAME': (str, 'uTorrent', ''),
     'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1),
+    'WAIT_UNTIL_RELEASE_DATE' : (int, 'General', 0),
     'WAFFLES': (int, 'Waffles', 0),
     'WAFFLES_PASSKEY': (str, 'Waffles', ''),
     'WAFFLES_RATIO': (str, 'Waffles', ''),
diff --git a/headphones/searcher.py b/headphones/searcher.py
index a2eca508..e92f43f4 100644
--- a/headphones/searcher.py
+++ b/headphones/searcher.py
@@ -29,6 +29,7 @@ import string
 import shutil
 import random
 import urllib
+import datetime
 import headphones
 import subprocess
 import unicodedata
@@ -189,10 +190,22 @@ def searchforalbum(albumid=None, new=False, losslessOnly=False,
         results = myDB.select('SELECT * from albums WHERE Status="Wanted" OR Status="Wanted Lossless"')
 
         for album in results:
+
             if not album['AlbumTitle'] or not album['ArtistName']:
                 logger.warn('Skipping release %s. No title available', album['AlbumID'])
                 continue
 
+            if headphones.CONFIG.WAIT_UNTIL_RELEASE_DATE and album['ReleaseDate']:
+                try:
+                    release_date = datetime.datetime.strptime(album['ReleaseDate'], "%Y-%m-%d")
+                except:
+                    logger.warn("No valid date for: %s. Skipping automatic search" % album['AlbumTitle'])
+                    continue
+
+                if release_date > datetime.datetime.today():
+                    logger.info("Skipping: %s. Waiting for release date of: %s" % (album['AlbumTitle'], album['ReleaseDate']))
+                    continue
+            
             new = True
 
             if album['Status'] == "Wanted Lossless":
diff --git a/headphones/webserve.py b/headphones/webserve.py
index d2d27c58..0edc50c1 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -1074,6 +1074,7 @@ class WebInterface(object):
             "file_underscores": checked(headphones.CONFIG.FILE_UNDERSCORES),
             "include_extras": checked(headphones.CONFIG.INCLUDE_EXTRAS),
             "official_releases_only": checked(headphones.CONFIG.OFFICIAL_RELEASES_ONLY),
+            "wait_until_release_date": checked(headphones.CONFIG.WAIT_UNTIL_RELEASE_DATE),
             "autowant_upcoming": checked(headphones.CONFIG.AUTOWANT_UPCOMING),
             "autowant_all": checked(headphones.CONFIG.AUTOWANT_ALL),
             "autowant_manually_added": checked(headphones.CONFIG.AUTOWANT_MANUALLY_ADDED),
@@ -1219,9 +1220,10 @@ class WebInterface(object):
         checked_configs = [
             "launch_browser", "enable_https", "api_enabled", "use_blackhole", "headphones_indexer", "use_newznab", "newznab_enabled",
             "use_nzbsorg", "use_omgwtfnzbs", "use_kat", "use_piratebay", "use_oldpiratebay", "use_mininova", "use_waffles", "use_rutracker",
-            "use_whatcd", "preferred_bitrate_allow_lossless", "detect_bitrate", "ignore_clean_releases", "freeze_db", "cue_split", "move_files", "rename_files",
-            "correct_metadata", "cleanup_files", "keep_nfo", "add_album_art", "embed_album_art", "embed_lyrics", "replace_existing_folders", "keep_original_folder",
-            "file_underscores", "include_extras", "official_releases_only", "autowant_upcoming", "autowant_all", "autowant_manually_added", "keep_torrent_files", "music_encoder",
+            "use_whatcd", "preferred_bitrate_allow_lossless", "detect_bitrate", "ignore_clean_releases", "freeze_db", "cue_split", "move_files", 
+            "rename_files", "correct_metadata", "cleanup_files", "keep_nfo", "add_album_art", "embed_album_art", "embed_lyrics", 
+            "replace_existing_folders", "keep_original_folder", "file_underscores", "include_extras", "official_releases_only", 
+            "wait_until_release_date", "autowant_upcoming", "autowant_all", "autowant_manually_added", "keep_torrent_files", "music_encoder",
             "encoderlossless", "encoder_multicore", "delete_lossless_files", "growl_enabled", "growl_onsnatch", "prowl_enabled",
             "prowl_onsnatch", "xbmc_enabled", "xbmc_update", "xbmc_notify", "lms_enabled", "plex_enabled", "plex_update", "plex_notify",
             "nma_enabled", "nma_onsnatch", "pushalot_enabled", "pushalot_onsnatch", "synoindex_enabled", "pushover_enabled",