diff --git a/.enb/make.js b/.enb/make.js
index 3a1602d..70dec49 100644
--- a/.enb/make.js
+++ b/.enb/make.js
@@ -1,9 +1,14 @@
 var fs = require('fs'),
     path = require('path'),
+    enbBemTechs = require('enb-bem-techs'),
+    bemhtml = require('enb-bemxjst/techs/bemhtml'),
+    bemjsonToHtml = require('enb-bemxjst/techs/bemjson-to-html'),
     DEFAULT_LANGS = ['ru', 'en'];
 
 module.exports = function(config) {
-    var tools = require('enb-bem-docs')(config),
+        config.includeConfig('enb-bem-docs');
+
+    var tools = config.module('enb-bem-docs').createConfigurator('docs'),
         langs = process.env.BEM_I18N_LANGS;
 
     config.setLanguages(langs? langs.split(' ') : [].concat(DEFAULT_LANGS));
@@ -11,14 +16,14 @@ module.exports = function(config) {
     config.nodes(['*.bundles/all-tests', '*.bundles/todos'], function(nodeConfig) {
         nodeConfig.addTechs([
             [require('enb/techs/file-provider'), { target : '?.bemjson.js' }],
-            [require('enb/techs/bemdecl-from-bemjson')],
+            [enbBemTechs.bemjsonToBemdecl],
             [require('enb/techs/bemdecl-from-deps-by-tech'), {
                 sourceTech : 'js',
                 destTech : 'bemhtml',
                 target : '?.bemhtml.bemdecl.js'
             }],
-            [require('enb/techs/deps')],
-            [require('enb/techs/files')],
+            [enbBemTechs.deps],
+            [enbBemTechs.files],
             [require('enb/techs/deps'), {
                 bemdeclTarget : '?.bemhtml.bemdecl.js',
                 depsTarget : '?.bemhtml.deps.js'
@@ -30,8 +35,7 @@ module.exports = function(config) {
             }],
             [require('enb-roole/techs/css-roole'), { target : '?.noprefix.css' }],
             [require('enb-diverse-js/techs/browser-js')],
-            [require('enb-bemxjst/techs/bemhtml-old'), { devMode : false }],
-            [require('enb-bemxjst/techs/bemhtml-old'), {
+            [require('enb-bemxjst/techs/bemhtml'), {
                 target : '?.browser.bemhtml.js',
                 filesTraget : '?.bemhtml.files',
                 devMode : false
@@ -44,7 +48,8 @@ module.exports = function(config) {
                 source : '?.pre.js',
                 target : '?.js'
             }],
-            [require('enb/techs/html-from-bemjson')]
+           [bemhtml, { devMode: process.env.BEMHTML_ENV === 'development' }],
+           [bemjsonToHtml],
         ]);
 
         nodeConfig.addTargets([
@@ -61,7 +66,7 @@ module.exports = function(config) {
         }
 
         nodeConfig.addTechs([
-            [require('enb/techs/levels'), { levels : levels }],
+            [enbBemTechs.levels, { levels : levels }],
             [require('enb-autoprefixer/techs/css-autoprefixer'), {
                 sourceTarget : '?.noprefix.css',
                 destTarget : '?.css',
@@ -88,13 +93,11 @@ module.exports = function(config) {
         });
     });
 
-    tools.configureSets({
-        sets : {
-            destPath : 'desktop.sets',
-            levels : getDesktopLibLevels(config)
-        },
-        jsdocs : {
-            _suffixes : ['vanilla.js', 'node.js', 'browser.js', 'js']
+    tools.configure({
+        destPath : 'desktop.sets',
+        levels : getDesktopLibLevels(config),
+        jsdoc : {
+            suffixes : ['vanilla.js', 'node.js', 'browser.js', 'js']
         },
         examples : {
             levels : getDesktopLibLevels(config),
diff --git a/bower.json b/bower.json
index edf5d6e..13d5232 100644
--- a/bower.json
+++ b/bower.json
@@ -15,7 +15,9 @@
     "libs"
   ],
   "dependencies": {
-    "bem-components": "git://github.com/bem/bem-components.git#v2",
-    "bem-pr": "~0.5.0"
+    "bem-components": "~2.4.0"
+  },
+  "devDependencies": {
+    "bem-pr": "~0.12.0"
   }
 }
diff --git a/package.json b/package.json
index c1899f7..357534c 100644
--- a/package.json
+++ b/package.json
@@ -15,13 +15,14 @@
     "bem-environ": "~1.4.0"
   },
   "devDependencies": {
-    "bem": "~0.8.0",
-    "bower-npm-install": "~0.5.4",
-    "enb-bem-docs": "git://github.com/andrewblond/enb-bem-docs.git#6b1544a8f3e516eaee3303cf84131e773868eb2b",
-    "enb": "0.10.0",
+    "bem": "~0.10.0",
+    "bower-npm-install": "~0.5.10",
+    "enb": "0.17.0",
+    "enb-bem-techs": "2.0.0",
+    "enb-bem-docs": "^0.11.0",
     "enb-diverse-js": "0.1.0",
-    "enb-modules": "0.1.1",
-    "enb-bemxjst": "1.1.1",
+    "enb-modules": "~0.2.0",
+    "enb-bemxjst": "v2.0.0-rc",
     "enb-roole": "0.2.1",
     "enb-autoprefixer": "0.1.0",
     "bem-tools-autoprefixer": "0.0.3",