diff --git a/pepper/cli.py b/pepper/cli.py
index 2048203..cd26dfb 100644
--- a/pepper/cli.py
+++ b/pepper/cli.py
@@ -110,7 +110,7 @@ def parse(self):
 
         self.parser.add_option(
             '--state-output', dest='state_output', default="full", type="choice",
-            choices = [ "full", "terse", "mixed", "changes", "filter" ],
+            choices = [ "full", "full_id", "terse", "terse_id", "mixed", "mixed_id", "changes", "changes_id", "filter", "filter_id" ],
             help=textwrap.dedent('''
                 Output mode for highstate formatter
             ''')