diff --git a/client/djrandom_client/client.py b/client/djrandom_client/client.py
index 3c2fd579b2cefdeef4ea6d7b93db3ff855bd15b0..0ad35888342accc8cc19eda9eda618ab4e7da651 100644
--- a/client/djrandom_client/client.py
+++ b/client/djrandom_client/client.py
@@ -133,6 +133,7 @@ def main():
                       'unlimited)')
     parser.add_option('--no_realtime_watch', action='store_true',
                       help='Monitor music_dir in realtime')
+    parser.add_option('--skip_version_check', action='store_true')
     daemonize.add_standard_options(parser)
     utils.read_config_defaults(
         parser, os.path.expanduser('~/.djrandom.conf'))
@@ -147,7 +148,7 @@ def main():
         parser.error('Too many arguments')
 
     # Perform a version check.
-    if utils.check_version():
+    if not opts.skip_version_check and utils.check_version():
         print >>sys.stderr, 'A new release is available! Please update.'
 
     # Reading from the configuration file will set this variable to