diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 17a6c963..3b59ef4e 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -277,7 +277,7 @@ def main():
     global config, options
 
     # Parse command line...
-    parser = OptionParser()
+    parser = OptionParser(usage="Usage: %prog [options] [APPID [APPID ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
     parser.add_option("--auto", action="store_true", default=False,
diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index 560d9979..3f23a16b 100644
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -41,7 +41,7 @@ def main():
     global options, config
 
     # Parse command line...
-    parser = OptionParser()
+    parser = OptionParser(usage="Usage: %prog [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
     parser.add_option("-a", "--all", action="store_true", default=False,
diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index d04c3a7d..85349fb1 100644
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -37,7 +37,6 @@ def main():
     global config, options
 
     # Parse command line...
-    parser = OptionParser()
     parser = OptionParser(usage="Usage: %prog [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 200917c6..0e02ed0d 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -35,8 +35,6 @@ def main():
     parser = OptionParser(usage="Usage: %prog [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
-    parser.add_option("-p", "--package", default=None,
-                      help="Scan only the specified package")
     parser.add_option("--nosvn", action="store_true", default=False,
                       help="Skip svn repositories - for test purposes, because they are too slow.")
     (options, args) = parser.parse_args()
diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index c067fccc..1c0c6b46 100644
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -34,11 +34,9 @@ def main():
     global options, config
 
     # Parse command line...
-    parser = OptionParser()
+    parser = OptionParser(usage="Usage: %prog [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
-    parser.add_option("-p", "--package", default=None,
-                      help="Verify only the specified package")
     (options, args) = parser.parse_args()
 
     config = common.read_config(options)