diff --git a/contrib/completion/bash/yii b/contrib/completion/bash/yii
index bc06b7a..c73d42f 100644
--- a/contrib/completion/bash/yii
+++ b/contrib/completion/bash/yii
@@ -42,7 +42,7 @@ _yii()
         ;;
         option)
             # fetch available options from ./yii help/list-action-options command
-            opts=$($yii help/list-action-options $command 2> /dev/null | grep -o '^--[a-zA-Z0-9]*')
+            opts=$($yii help/list-action-options $command 2> /dev/null | grep -o '^--[a-zA-Z0-9\-]*')
         ;;
         value)
             # TODO allow normal file completion after an option, e.g. --migrationPath=...
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 211d6c7..8be6fe7 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -4,7 +4,7 @@ Yii Framework 2 Change Log
 2.0.16 under development
 ------------------------
 
-- no changes in this release.
+- Bug #15988: Fixed bash completion (alekciy)
 
 2.0.15.1 March 21, 2018
 -----------------------