diff --git a/extensions/bootstrap/CHANGELOG.md b/extensions/bootstrap/CHANGELOG.md
index 93c3ff4a65..51c3116716 100644
--- a/extensions/bootstrap/CHANGELOG.md
+++ b/extensions/bootstrap/CHANGELOG.md
@@ -6,6 +6,7 @@ Yii Framework 2 bootstrap extension Change Log
 
 - Bug #5570: `yii\bootstrap\Tabs` would throw an exception if `content` is not set for one of its `items` (RomeroMsk)
 - Enh #5735: Added `yii\bootstrap\Tabs::renderTabContent` to support manually rendering tab contents (RomeroMsk)
+- Chg #5874: Upgraded Twitter Bootstrap to 3.3.x (samdark)
 
 
 2.0.0 October 12, 2014
diff --git a/extensions/bootstrap/composer.json b/extensions/bootstrap/composer.json
index e90811ade1..4a5da0d46b 100644
--- a/extensions/bootstrap/composer.json
+++ b/extensions/bootstrap/composer.json
@@ -19,7 +19,7 @@
     ],
     "require": {
         "yiisoft/yii2": "*",
-        "bower-asset/bootstrap": "3.2.* | 3.1.*"
+        "bower-asset/bootstrap": "3.3.* | 3.2.* | 3.1.*"
     },
     "autoload": {
         "psr-4": {
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index c8fd8b09b3..61c07fbce0 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -31,7 +31,8 @@ Yii Framework 2 Change Log
 - Enh #5806: Allow `Html::encode()` to be used when the application is not started (qiangxue)
 - Enh: `Console::confirm()` now uses `Console::stdout()` instead of `echo` to be consistent with all other functions (cebe)
 - Chg #3630: `yii\db\Command::queryInternal()` is now protected (samdark) 
-- Chg #5508: Dropped the support for the `--append` option for the `fixture` command (qiangxue) 
+- Chg #5508: Dropped the support for the `--append` option for the `fixture` command (qiangxue)
+- Chg #5874: Upgraded Twitter Bootstrap to 3.3.x (samdark)
 
 2.0.0 October 12, 2014
 ----------------------