diff --git a/common/config/db.php b/common/config/db.php
index 8cfbae8..d2266ae 100644
--- a/common/config/db.php
+++ b/common/config/db.php
@@ -1,16 +1,21 @@
 <?php
 /**
- * @author Semenov Alexander <support@skeeks.com>
+ * @author Semenov Alexander <semenov@skeeks.com>
  * @link http://skeeks.com/
- * @copyright 2010 SkeekS (СкикС)
- * @date 17.09.2015
+ * @copyright 2010 SkeekS (�����)
+ * @date 18.09.2015
  */
-return [
-    'class' => 'yii\db\Connection',
-    'dsn' => 'mysql:host=localhost;dbname=skeeks',
-    'username' => 'skeeks',
-    'password' => 'N7j27QFsbMn4EV77',
-    'charset' => 'utf8',
-    'enableSchemaCache' => true,
-    'schemaCacheDuration' => 3600,
+return
+[
+    'components'    => [
+        'db' => [
+            'class' => 'yii\db\Connection',
+            'dsn' => 'mysql:host=localhost;dbname=skeeks',
+            'username' => 'skeeks',
+            'password' => 'N7j27QFsbMn4EV77',
+            'charset' => 'utf8',
+            'enableSchemaCache' => true,
+            'schemaCacheDuration' => 3600,
+        ]
+    ]
 ];
diff --git a/common/config/main.php b/common/config/main.php
index 6d48977..3e5525e 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -11,8 +11,6 @@
 $config = [
     'components'    =>
     [
-        'db' => require __DIR__ . '/db.php',
-
         'urlManager' => [
             'rules' => [
                 [
diff --git a/composer.json b/composer.json
index 15d0613..b4d54fe 100644
--- a/composer.json
+++ b/composer.json
@@ -67,6 +67,7 @@
         "config-plugin": {
             "web": [
                 "common/config/main.php",
+                "common/config/db.php",
                 "frontend/config/main.php"
             ],
             "web-dev": [
@@ -79,6 +80,7 @@
             ],
             "console": [
                 "common/config/main.php",
+                "common/config/db.php",
                 "console/config/main.php"
             ],
             "console-dev": [