diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py
index 842fd6481f..dec7c052b3 100644
--- a/django/core/management/__init__.py
+++ b/django/core/management/__init__.py
@@ -253,7 +253,7 @@ class ManagementUtility(object):
                 options.extend((sorted(s_opt.option_strings)[0], s_opt.nargs != 0) for s_opt in
                                parser._actions if s_opt.option_strings)
             else:
-                options.extend((s_opt.get_opt_string(), s_opt.nargs) for s_opt in
+                options.extend((s_opt.get_opt_string(), s_opt.nargs != 0) for s_opt in
                                parser.option_list)
             # filter out previously specified options from available options
             prev_opts = [x.split('=')[0] for x in cwords[1:cword - 1]]
diff --git a/docs/releases/1.8.5.txt b/docs/releases/1.8.5.txt
index 66cee6e25c..3f999acfba 100644
--- a/docs/releases/1.8.5.txt
+++ b/docs/releases/1.8.5.txt
@@ -23,3 +23,6 @@ Bugfixes
 
 * Fixed crash when using a value in ``ModelAdmin.list_display`` that clashed
   with a reverse field on the model (:ticket:`25299`).
+
+* Fixed autocompletion for options of non-``argparse`` management commands
+  (:ticket:`25372`).