diff --git a/package.json b/package.json
index 73dbdd5..2f54da6 100644
--- a/package.json
+++ b/package.json
@@ -22,12 +22,12 @@
     "react-dom": "^0.14.3",
     "react-height": "^2.0.3",
     "react-helmet": "^2.3.1",
-    "react-intl": "^2.0.0-beta-2",
+    "react-intl": "=2.0.0-beta-2",
     "react-motion": "^0.3.1",
     "react-redux": "^4.0.0",
     "react-router": "^2.0.0-rc5",
+    "react-router-redux": "^2.1.0",
     "redux": "^3.0.4",
-    "redux-simple-router": "^2.0.0",
     "redux-thunk": "^1.0.0"
   },
   "devDependencies": {
diff --git a/src/components/auth/Login.jsx b/src/components/auth/Login.jsx
index c0f2b42..bd0a9ef 100644
--- a/src/components/auth/Login.jsx
+++ b/src/components/auth/Login.jsx
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { routeActions } from 'redux-simple-router';
+import { routeActions } from 'react-router-redux';
 
 import { FormattedMessage as Message } from 'react-intl';
 import Helmet from 'react-helmet';
diff --git a/src/index.js b/src/index.js
index d97cddf..b0ff9eb 100644
--- a/src/index.js
+++ b/src/index.js
@@ -13,7 +13,7 @@ import { Provider as ReduxProvider } from 'react-redux';
 import thunk from 'redux-thunk';
 
 import { Router, browserHistory } from 'react-router';
-import { syncHistory, routeReducer } from 'redux-simple-router';
+import { syncHistory, routeReducer } from 'react-router-redux';
 
 import { IntlProvider } from 'react-intl';
 
diff --git a/webpack.config.js b/webpack.config.js
index 114c694..3654cd0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -37,16 +37,22 @@ var webpackConfig = {
     entry: {
         app: path.join(__dirname, 'src'),
         vendor: [
+            'babel-polyfill',
+            'classnames',
             'history',
+            'intl-format-cache',
+            'intl-messageformat',
             'react',
+            'react-dom',
+            'react-height',
+            'react-helmet',
+            'react-intl',
+            'react-motion',
             'react-redux',
             'react-router',
-            'redux-simple-router',
+            'react-router-redux',
             'redux',
-
-            // I18n
-            'intl-format-cache',
-            'intl-messageformat'
+            'redux-thunk'
         ]
     },