diff --git a/az.completion b/az.completion
index 5a598709306..53033b6ed73 100644
--- a/az.completion
+++ b/az.completion
@@ -18,4 +18,4 @@ _python_argcomplete() {
         compopt -o nospace
     fi
 }
-complete -o nospace -F _python_argcomplete "az"
\ No newline at end of file
+complete -o nospace -o default -o bashdefault -F _python_argcomplete "az"
\ No newline at end of file
diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index c7818dbec41..8862dafced7 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -7,6 +7,10 @@ Release History
 
 * Support app creation/update with the new sku name ST0, ST1, ST2.
 
+**Misc**
+
+* Fix #6371: Support filename and environment variable completion in Bash
+
 2.0.80
 ++++++