diff --git a/osc/commandline.py b/osc/commandline.py
index eb5fc9a70..0894aa2b4 100644
--- a/osc/commandline.py
+++ b/osc/commandline.py
@@ -6756,22 +6756,27 @@ def do_checkconstraints(self, subcmd, opts, *args):
 
         usage:
             remote request:
-                osc checkconstraints [OPTS] PROJECT PACKAGE REPOSITORY ARCH
+                osc checkconstraints [OPTS] PROJECT PACKAGE REPOSITORY ARCH [CONSTRAINTSFILE]
 
             in a package working copy:
-                osc checkconstraints [OPTS] REPOSITORY ARCH CONSTRAINTSFILE
+                osc checkconstraints [OPTS] REPOSITORY ARCH [CONSTRAINTSFILE]
                 osc checkconstraints [OPTS] CONSTRAINTSFILE
                 osc checkconstraints [OPTS]
         """
         repository = arch = constraintsfile = None
         args = slash_split(args)
 
-        if len(args) == 4:
+        if len(args) > 5:
+            raise oscerr.WrongArgs('Too many arguments')
+
+        if len(args) == 4 or len(args) == 5:
             project = self._process_project_name(args[0])
             package = args[1]
             repository = args[2]
             arch = args[3]
             opts.ignore_file = True
+            if len(args) == 5:
+                constraintsfile = args[4];
         else:
             project = store_read_project('.')
             package = store_read_package('.')