diff --git a/builder/cmdline.ml b/builder/cmdline.ml
index 122c62b1d..1242aaaaa 100644
--- a/builder/cmdline.ml
+++ b/builder/cmdline.ml
@@ -243,6 +243,10 @@ read the man page virt-builder(1).
         exit 1
       )
     | `List ->
+      if format <> None then (
+        eprintf (f_"%s: virt-builder --list: use '--list-format', not '--format'.\n") prog;
+        exit 1
+      );
       (match args with
       | [] -> ""
       | _ ->
diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
index 02bf1816c..2e6522ad0 100644
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
@@ -307,13 +307,13 @@ alternate home directory:
 
 =item B<--list>
 
-=item B<--list --format> format
+=item B<--list --list-format> format
 
 =item B<--list --long>
 
 List available templates.
 
-It is possible to choose with I<--format> the output format for the list
+It is possible to choose with I<--list-format> the output format for the list
 templates:
 
 =over 4