diff --git a/contrib/completion/bash/yii b/contrib/completion/bash/yii
index 8f5ea8c58e..084325ad20 100644
--- a/contrib/completion/bash/yii
+++ b/contrib/completion/bash/yii
@@ -6,7 +6,7 @@
 # - http://www.yiiframework.com/doc-2.0/guide-tutorial-console.html#bash-completion
 #
 # Usage:
-# Temporarily you can source this file in you bash by typing: source yii.bash-completion
+# Temporarily you can source this file in you bash by typing: source yii
 # For permanent availability, copy or link this file to /etc/bash_completion.d/
 #
 
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index f274c7df4d..4c9d63017c 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -28,10 +28,9 @@ Yii Framework 2 Change Log
 - Bug #13089: Fixed `yii\console\controllers\AssetController::adjustCssUrl()` breaks URL reference specification (`url(#id)`) (vitalyzhakov)
 - Bug #7727: Fixed truncateHtml leaving extra tags (developeruz)
 - Bug #13118: Fixed `handleAction()` function in `yii.js` to handle attribute `data-pjax=0` as disabled PJAX (silverfire)
+- Enh #475: Added Bash and Zsh completion support for the `./yii` command (cebe, silverfire)
 - Enh #6373: Introduce `yii\db\Query::emulateExecution()` to force returning an empty result for a query (klimov-paul)
 - Enh #6809: Added `yii\caching\Cache::$defaultDuration` property, allowing to set custom default cache duration (sdkiller)
-- Enh #475: Added basic bash completion support for the `./yii` command (cebe)
-- Enh #6809: Added `\yii\caching\Cache::$defaultDuration` property, allowing to set custom default cache duration (sdkiller)
 - Enh #7333: Improved error message for `yii\di\Instance::ensure()` when a component does not exist (cebe)
 - Enh #7420: Attributes for prompt generated with `renderSelectOptions` of `\yii\helpers\Html` helper (arogachev)
 - Enh #9162: Added support of closures in `value` for attributes in `yii\widgets\DetailView` (arogachev)