diff --git a/contrib/completion/bash/yii b/contrib/completion/bash/yii
index c73d42f..c5e7884 100644
--- a/contrib/completion/bash/yii
+++ b/contrib/completion/bash/yii
@@ -57,4 +57,4 @@ _yii()
 
 # register completion for the ./yii command
 # you may adjust this line if your command file is named differently
-complete -F _yii ./yii yii
+complete -o default -F _yii ./yii yii
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index be9709d..35108af 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -4,6 +4,7 @@ Yii Framework 2 Change Log
 2.0.16 under development
 ------------------------
 
+- Bug #16926: Fix shell autocompletion (GHopperMSK)
 - Bug #15850: check basePath is writable on publish in AssetManager (Groonya)
 - Bug #16910: Fix messages sorting on extract (Groonya)
 - Bug #16969: Fix `yii\filters\PageCache` incorrectly storing empty data in some cases (sammousa)