diff --git a/couchpotato/cli.py b/couchpotato/cli.py
index 5d792a5b..8e69af14 100644
--- a/couchpotato/cli.py
+++ b/couchpotato/cli.py
@@ -1,4 +1,4 @@
-from argparse import ArgumentParser
+from blinker.base import signal
 from couchpotato import web
 from couchpotato.api import api
 from couchpotato.core.logger import CPLog
@@ -15,17 +15,18 @@ def cmd_couchpotato(base_path, args):
     '''Commandline entry point.'''
 
     # Options
-    parser = ArgumentParser('usage: %prog [options]')
-    parser.add_argument('-s', '--datadir', default = base_path,
+    parser = OptionParser()
+    parser.add_option('-s', '--datadir', default = base_path,
                         dest = 'data_dir', help = 'Absolute or ~/ path, where settings/logs/database data is saved (default ./)')
-    parser.add_argument('-t', '--test', '--debug', action = 'store_true',
+    parser.add_option('-t', '--test', '--debug', action = 'store_true',
                         dest = 'debug', help = 'Debug mode')
-    parser.add_argument('-q', '--quiet', action = 'store_true',
+    parser.add_option('-q', '--quiet', action = 'store_true',
                         dest = 'quiet', help = "Don't log to console")
-    parser.add_argument('-d', '--daemon', action = 'store_true',
+    parser.add_option('-d', '--daemon', action = 'store_true',
                         dest = 'daemonize', help = 'Daemonize the app')
 
-    (options, args) = parser.parse_known_args(args)
+    (options, args) = parser.parse_args(args)
+
 
     # Create data dir if needed
     if not os.path.isdir(options.data_dir):