diff --git a/completions/bash/cdist-completion.bash b/completions/bash/cdist-completion.bash
index 68f45327..1c4226c2 100644
--- a/completions/bash/cdist-completion.bash
+++ b/completions/bash/cdist-completion.bash
@@ -36,7 +36,7 @@ _cdist()
             return 0
             ;;
         config|install)
-            opts="-h --help -d --debug -v --verbose -b --enable-beta \
+            opts="-h --help -d --debug -v --verbose -b --beta \
                 -c --conf-dir -f --file -i --initial-manifest -j --jobs \
                 -n --dry-run -o --out-dir -p --parallel -s --sequential \
                 --remote-copy --remote-exec"
diff --git a/completions/zsh/_cdist b/completions/zsh/_cdist
index dc320224..001356d4 100644
--- a/completions/zsh/_cdist
+++ b/completions/zsh/_cdist
@@ -36,7 +36,7 @@ _cdist()
                     esac
                     ;;
                 config|install)
-                    opts=(-h --help -d --debug -v --verbose -b --enable-beta -c --conf-dir -f --file -i --initial-manifest -j --jobs -n --dry-run -o --out-dir -p --parallel -s --sequential --remote-copy --remote-exec)
+                    opts=(-h --help -d --debug -v --verbose -b --beta -c --conf-dir -f --file -i --initial-manifest -j --jobs -n --dry-run -o --out-dir -p --parallel -s --sequential --remote-copy --remote-exec)
                     compadd "$@" -- $opts
                     ;;
                *)
diff --git a/docs/src/man1/cdist.rst b/docs/src/man1/cdist.rst
index 08c856b1..55901300 100644
--- a/docs/src/man1/cdist.rst
+++ b/docs/src/man1/cdist.rst
@@ -69,10 +69,11 @@ CONFIG/INSTALL
 --------------
 Configure/install one or more hosts.
 
-.. option:: -b, --enable-beta
+.. option:: -b, --beta
 
-    Enable beta functionalities. Beta functionalities include the
-    following options: -j/--jobs.
+    Enable beta functionalities.
+    
+    Can also be enabled using CDIST_BETA env var.
 
 .. option:: -c CONF_DIR, --conf-dir CONF_DIR