diff --git a/Changes.rst b/Changes.rst
index da10684..f6b4a09 100644
--- a/Changes.rst
+++ b/Changes.rst
@@ -1,3 +1,8 @@
+Changes for v3.1.0 (2022-07-24)
+===============================
+
+-  Use configurable output grammar, compatible with YAML 1.1
+
 Changes for v3.0.2 (2022-07-05)
 ===============================
 
diff --git a/docs/cli-doc.txt b/docs/cli-doc.txt
index a789de6..0128cf4 100644
--- a/docs/cli-doc.txt
+++ b/docs/cli-doc.txt
@@ -1,4 +1,5 @@
 usage: yq [options] <jq filter> [input file...]
+          [--indentless-lists] [--in-place] [--version]
           [jq_filter] [files [files ...]]
 
 yq: Command-line YAML processor - jq wrapper for YAML documents
@@ -16,6 +17,8 @@ optional arguments:
                         Transcode jq JSON output back into YAML and emit it
   --yaml-roundtrip, --yml-roundtrip, -Y
                         Transcode jq JSON output back into YAML and emit it. Preserve YAML tags and styles by representing them as extra items in their enclosing mappings and sequences while in JSON. This option is incompatible with jq filters that do not expect these extra items.
+  --yaml-output-grammar-version {1.1,1.2}, --yml-out-ver {1.1,1.2}
+                        When using --yaml-output, specify output grammar (the default is 1.1 and will be changed to 1.2 in a future version). Setting this to 1.2 will cause strings like 'on' and 'no' to be emitted unquoted.
   --width WIDTH, -w WIDTH
                         When using --yaml-output, specify string wrap width
   --indentless-lists, --indentless
diff --git a/setup.py b/setup.py
index 2f19f3c..9a7f643 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name="yq",
-    version="3.0.2",
+    version="3.1.0",
     url="https://github.com/kislyuk/yq",
     license="Apache Software License",
     author="Andrey Kislyuk",