diff --git a/fdroidserver/btlog.py b/fdroidserver/btlog.py
index 43ea2313..08993aec 100755
--- a/fdroidserver/btlog.py
+++ b/fdroidserver/btlog.py
@@ -148,7 +148,7 @@ For more info on this idea:
 def main():
     global options
 
-    parser = ArgumentParser(usage="%(prog)s [options]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("--git-repo",
                         default=os.path.join(os.getcwd(), 'binary_transparency'),
diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index d2833b81..604f4e1a 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -597,7 +597,7 @@ def main():
     global config, options
 
     # Parse command line...
-    parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("appid", nargs='*', help=_("application ID of file to operate on"))
     parser.add_argument("--auto", action="store_true", default=False,
diff --git a/fdroidserver/gpgsign.py b/fdroidserver/gpgsign.py
index a224c3f7..86258b63 100644
--- a/fdroidserver/gpgsign.py
+++ b/fdroidserver/gpgsign.py
@@ -47,7 +47,7 @@ def main():
     global config, options
 
     # Parse command line...
-    parser = ArgumentParser(usage="%(prog)s [options]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     options = parser.parse_args()
 
diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index a2e6578d..dd48e05f 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -568,7 +568,7 @@ def main():
     global config, options
 
     # Parse command line...
-    parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("-f", "--format", action="store_true", default=False,
                         help=_("Also warn about formatting issues, like rewritemeta -l"))
diff --git a/fdroidserver/mirror.py b/fdroidserver/mirror.py
index 2510e3d0..983a9dcd 100644
--- a/fdroidserver/mirror.py
+++ b/fdroidserver/mirror.py
@@ -41,7 +41,7 @@ def _run_wget(path, urls):
 def main():
     global options
 
-    parser = ArgumentParser(usage=_("%(prog)s [options] url"))
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("url", nargs='?',
                         help=_('Base URL to mirror, can include the index signing key '
diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py
index daca2082..671c217a 100644
--- a/fdroidserver/nightly.py
+++ b/fdroidserver/nightly.py
@@ -88,7 +88,7 @@ def _ssh_key_from_debug_keystore(keystore=KEYSTORE_FILE):
 
 def main():
 
-    parser = ArgumentParser(usage="%(prog)s")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("--keystore", default=KEYSTORE_FILE,
                         help=_("Specify which debug keystore file to use."))
diff --git a/fdroidserver/readmeta.py b/fdroidserver/readmeta.py
index 7ec1cb05..f9688658 100644
--- a/fdroidserver/readmeta.py
+++ b/fdroidserver/readmeta.py
@@ -25,7 +25,7 @@ options = None
 
 def main():
 
-    parser = ArgumentParser(usage="%(prog)s")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index 3b89e6bf..5a6a10a3 100644
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -49,8 +49,7 @@ def main():
 
     global config, options
 
-    # Parse command line...
-    parser = ArgumentParser(usage="%(prog)s [options] [APPID [APPID ...]]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("-l", "--list", action="store_true", default=False,
                         help=_("List files that would be reformatted"))
diff --git a/fdroidserver/signatures.py b/fdroidserver/signatures.py
index 79bea6a1..78f4bcd3 100644
--- a/fdroidserver/signatures.py
+++ b/fdroidserver/signatures.py
@@ -87,9 +87,7 @@ def extract(options):
 
 
 def main():
-
-    # Parse command line...
-    parser = ArgumentParser(usage="%(prog)s [options] APK [APK...]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     parser.add_argument("APK", nargs='*',
                         help=_("signed APK, either a file-path or HTTPS URL."))
diff --git a/fdroidserver/signindex.py b/fdroidserver/signindex.py
index 693b127e..2c5859d5 100644
--- a/fdroidserver/signindex.py
+++ b/fdroidserver/signindex.py
@@ -91,8 +91,7 @@ def main():
 
     global config, options
 
-    # Parse command line...
-    parser = ArgumentParser(usage="%(prog)s [options]")
+    parser = ArgumentParser()
     common.setup_global_opts(parser)
     options = parser.parse_args()