diff --git a/changelogs/fragments/until_also_implicit.yml b/changelogs/fragments/until_also_implicit.yml
new file mode 100644
index 00000000000..35c003b271e
--- /dev/null
+++ b/changelogs/fragments/until_also_implicit.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - ansible-doc will now also display until as an 'implicit' templating keyword.
diff --git a/lib/ansible/cli/doc.py b/lib/ansible/cli/doc.py
index 5471a756aa0..d94815faa1d 100755
--- a/lib/ansible/cli/doc.py
+++ b/lib/ansible/cli/doc.py
@@ -603,7 +603,9 @@ class DocCLI(CLI, RoleMixin):
 
                             kdata['type'] = getattr(fa, 'isa', 'string')
 
-                            if keyword.endswith('when'):
+                            if keyword.endswith('when') or keyword in ('until',):
+                                # TODO: make this a field attribute property,
+                                # would also helps with the warnings on {{}} stacking
                                 kdata['template'] = 'implicit'
                             elif getattr(fa, 'static'):
                                 kdata['template'] = 'static'