diff --git a/headphones/__init__.py b/headphones/__init__.py
index 14b02970..6119a807 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -61,6 +61,9 @@ CURRENT_VERSION = None
 LATEST_VERSION = None
 COMMITS_BEHIND = None
 
+CHECK_GITHUB = False
+CHECK_GITHUB_ON_STARTUP = False
+
 MUSIC_DIR = None
 DESTINATION_DIR = None
 FOLDER_FORMAT = None
@@ -211,7 +214,7 @@ def initialize():
     
         global __INITIALIZED__, FULL_PATH, PROG_DIR, VERBOSE, DAEMON, DATA_DIR, CONFIG_FILE, CFG, CONFIG_VERSION, LOG_DIR, CACHE_DIR, \
                 HTTP_PORT, HTTP_HOST, HTTP_USERNAME, HTTP_PASSWORD, HTTP_ROOT, LAUNCH_BROWSER, API_ENABLED, API_KEY, GIT_PATH, \
-                CURRENT_VERSION, LATEST_VERSION, MUSIC_DIR, DESTINATION_DIR, PREFERRED_QUALITY, PREFERRED_BITRATE, DETECT_BITRATE, \
+                CURRENT_VERSION, LATEST_VERSION, CHECK_GITHUB, CHECK_GITHUB_ON_STARTUP, MUSIC_DIR, DESTINATION_DIR, PREFERRED_QUALITY, PREFERRED_BITRATE, DETECT_BITRATE, \
                 ADD_ARTISTS, CORRECT_METADATA, MOVE_FILES, RENAME_FILES, FOLDER_FORMAT, FILE_FORMAT, CLEANUP_FILES, INCLUDE_EXTRAS, AUTOWANT_UPCOMING, AUTOWANT_ALL, \
                 ADD_ALBUM_ART, EMBED_ALBUM_ART, EMBED_LYRICS, DOWNLOAD_DIR, BLACKHOLE, BLACKHOLE_DIR, USENET_RETENTION, SEARCH_INTERVAL, \
                 TORRENTBLACKHOLE_DIR, NUMBEROFSEEDERS, ISOHUNT, KAT, MININOVA, DOWNLOAD_TORRENT_DIR, \
@@ -257,6 +260,9 @@ def initialize():
         GIT_PATH = check_setting_str(CFG, 'General', 'git_path', '')
         LOG_DIR = check_setting_str(CFG, 'General', 'log_dir', '')
         
+        CHECK_GITHUB = bool(check_setting_int(CFG, 'General', 'check_github', 1))
+        CHECK_GITHUB_ON_STARTUP = bool(check_setting_int(CFG, 'General', 'check_github_on_startup', 1))
+        
         MUSIC_DIR = check_setting_str(CFG, 'General', 'music_dir', '')
         DESTINATION_DIR = check_setting_str(CFG, 'General', 'destination_dir', '')
         PREFERRED_QUALITY = check_setting_int(CFG, 'General', 'preferred_quality', 0)
@@ -426,10 +432,13 @@ def initialize():
         CURRENT_VERSION = versioncheck.getVersion()
         
         # Check for new versions
-        try:
-            LATEST_VERSION = versioncheck.checkGithub()
-        except:
-            LATEST_VERSION = CURRENT_VERSION
+        if CHECK_GITHUB_ON_STARTUP:
+        	try:
+        	    LATEST_VERSION = versioncheck.checkGithub()
+        	except:
+        	    LATEST_VERSION = CURRENT_VERSION
+        else:
+        	LATEST_VERSION = CURRENT_VERSION
 
         __INITIALIZED__ = True
         return True
@@ -510,6 +519,9 @@ def config_write():
     new_config['General']['api_key'] = API_KEY
     new_config['General']['log_dir'] = LOG_DIR
     new_config['General']['git_path'] = GIT_PATH
+    
+    new_config['General']['check_github'] = int(CHECK_GITHUB)
+    new_config['General']['check_github_on_startup'] = int(CHECK_GITHUB_ON_STARTUP)
 
     new_config['General']['music_dir'] = MUSIC_DIR
     new_config['General']['destination_dir'] = DESTINATION_DIR
@@ -628,7 +640,10 @@ def start():
         SCHED.add_interval_job(updater.dbUpdate, hours=48)
         SCHED.add_interval_job(searcher.searchforalbum, minutes=SEARCH_INTERVAL)
         SCHED.add_interval_job(librarysync.libraryScan, minutes=LIBRARYSCAN_INTERVAL)
-        SCHED.add_interval_job(versioncheck.checkGithub, minutes=300)
+        
+        if CHECK_GITHUB:
+            SCHED.add_interval_job(versioncheck.checkGithub, minutes=300)
+        
         SCHED.add_interval_job(postprocessor.checkFolder, minutes=DOWNLOAD_SCAN_INTERVAL)
 
         SCHED.start()