diff --git a/server/index.js b/server/index.js
index 9670ce53..2445948d 100644
--- a/server/index.js
+++ b/server/index.js
@@ -25,7 +25,7 @@ const qs = require('qs');
 const url = require('url');
 const _ = require('lodash');
 const React = require('react');
-const { createServerRenderContext } = require('react-router');
+const { createServerRenderContext } = require('react-router-dom');
 const sagaEffects = require('redux-saga/effects');
 const auth = require('./auth');
 const sdk = require('./fakeSDK');
diff --git a/src/Routes.js b/src/Routes.js
index bc65cf32..33e98f7b 100644
--- a/src/Routes.js
+++ b/src/Routes.js
@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import { Miss } from 'react-router';
+import { Miss } from 'react-router-dom';
 import { RouterProvider, RoutesProvider } from './components';
 import { NotFoundPage, MatchWithSubRoutes } from './containers';
 import { flattenRoutes } from './routesConfiguration';
diff --git a/src/app.js b/src/app.js
index d1fb5236..24e2f73f 100644
--- a/src/app.js
+++ b/src/app.js
@@ -1,7 +1,7 @@
 import React, { PropTypes } from 'react';
 import ReactDOMServer from 'react-dom/server';
 import Helmet from 'react-helmet';
-import { BrowserRouter, ServerRouter } from 'react-router';
+import { BrowserRouter, ServerRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import { IntlProvider, addLocaleData } from 'react-intl';
 import en from 'react-intl/locale-data/en';
diff --git a/src/app.test.js b/src/app.test.js
index c0eac4ae..f4023f84 100644
--- a/src/app.test.js
+++ b/src/app.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactDOMServer from 'react-dom/server';
 import { forEach } from 'lodash';
-import { createServerRenderContext } from 'react-router';
+import { createServerRenderContext } from 'react-router-dom';
 import { ClientApp, ServerApp } from './app';
 import configureStore from './store';
 
diff --git a/src/components/NamedLink/NamedLink.js b/src/components/NamedLink/NamedLink.js
index 413a7dbf..4d0cd678 100644
--- a/src/components/NamedLink/NamedLink.js
+++ b/src/components/NamedLink/NamedLink.js
@@ -4,7 +4,7 @@
  * (Helps to narrow down the scope of possible format changes to routes.)
  */
 import React, { PropTypes } from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { pathByRouteName } from '../../routesConfiguration';
 
 const NamedLink = (props, context) => {
diff --git a/src/components/NamedRedirect/NamedRedirect.js b/src/components/NamedRedirect/NamedRedirect.js
index 7e9c0f53..7c86f022 100644
--- a/src/components/NamedRedirect/NamedRedirect.js
+++ b/src/components/NamedRedirect/NamedRedirect.js
@@ -4,7 +4,7 @@
  * (Helps to narrow down the scope of possible format changes to routes.)
  */
 import React, { PropTypes } from 'react';
-import { Redirect } from 'react-router';
+import { Redirect } from 'react-router-dom';
 import { pathByRouteName } from '../../routesConfiguration';
 
 const NamedRedirect = (props, context) => {
diff --git a/src/containers/AuthenticationPage/AuthenticationPage.js b/src/containers/AuthenticationPage/AuthenticationPage.js
index 6cf598f2..d1170684 100644
--- a/src/containers/AuthenticationPage/AuthenticationPage.js
+++ b/src/containers/AuthenticationPage/AuthenticationPage.js
@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 import { connect } from 'react-redux';
-import { Link, Redirect } from 'react-router';
+import { Link, Redirect } from 'react-router-dom';
 import { PageLayout } from '../../components';
 import { LoginForm, SignUpForm } from '../../containers';
 import { login } from '../../ducks/Auth.ducks';
diff --git a/src/containers/InboxPage/InboxPage.js b/src/containers/InboxPage/InboxPage.js
index bab272aa..d3dc2e76 100644
--- a/src/containers/InboxPage/InboxPage.js
+++ b/src/containers/InboxPage/InboxPage.js
@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { PageLayout } from '../../components';
 
 const toPath = (filter, id) => {
diff --git a/src/containers/ListingPage/ListingPage.js b/src/containers/ListingPage/ListingPage.js
index e5961c87..d26092f5 100644
--- a/src/containers/ListingPage/ListingPage.js
+++ b/src/containers/ListingPage/ListingPage.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { NamedLink, PageLayout } from '../../components';
 import css from './ListingPage.css';
 
diff --git a/src/containers/ManageListingsPage/ManageListingsPage.js b/src/containers/ManageListingsPage/ManageListingsPage.js
index f9919b58..11b3d7aa 100644
--- a/src/containers/ManageListingsPage/ManageListingsPage.js
+++ b/src/containers/ManageListingsPage/ManageListingsPage.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { PageLayout } from '../../components';
 
 export default () => (
diff --git a/src/containers/MatchWithSubRoutes/MatchWithSubRoutes.js b/src/containers/MatchWithSubRoutes/MatchWithSubRoutes.js
index 1d971115..d124b446 100644
--- a/src/containers/MatchWithSubRoutes/MatchWithSubRoutes.js
+++ b/src/containers/MatchWithSubRoutes/MatchWithSubRoutes.js
@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 import { connect } from 'react-redux';
-import { Match, Redirect } from 'react-router';
+import { Match, Redirect } from 'react-router-dom';
 import routesConfiguration, { pathByRouteName } from '../../routesConfiguration';
 
 // wrap `Match` and use this everywhere instead, then when
diff --git a/src/containers/NotFoundPage/NotFoundPage.js b/src/containers/NotFoundPage/NotFoundPage.js
index 2aa3dc62..58f422fe 100644
--- a/src/containers/NotFoundPage/NotFoundPage.js
+++ b/src/containers/NotFoundPage/NotFoundPage.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { PageLayout } from '../../components';
 
 export default () => (
diff --git a/src/containers/SalesConversationPage/SalesConversationPage.js b/src/containers/SalesConversationPage/SalesConversationPage.js
index f1885721..ef4053ee 100644
--- a/src/containers/SalesConversationPage/SalesConversationPage.js
+++ b/src/containers/SalesConversationPage/SalesConversationPage.js
@@ -1,6 +1,6 @@
 /* eslint-disable react/no-unescaped-entities */
 import React, { PropTypes } from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { PageLayout } from '../../components';
 
 const SalesConversationPage = props => {
diff --git a/src/containers/StyleguidePage/StyleguidePage.js b/src/containers/StyleguidePage/StyleguidePage.js
index b51b777a..eb2ce396 100644
--- a/src/containers/StyleguidePage/StyleguidePage.js
+++ b/src/containers/StyleguidePage/StyleguidePage.js
@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { map, size } from 'lodash';
 import * as allExamples from '../../examples';
 
diff --git a/src/containers/Topbar/Topbar.js b/src/containers/Topbar/Topbar.js
index aaaea8e9..9ba0f6d3 100644
--- a/src/containers/Topbar/Topbar.js
+++ b/src/containers/Topbar/Topbar.js
@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 import { connect } from 'react-redux';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { logout } from '../../ducks/Auth.ducks';
 
 import css from './Topbar.css';
diff --git a/src/routesConfiguration.js b/src/routesConfiguration.js
index 09df1016..f3864e30 100644
--- a/src/routesConfiguration.js
+++ b/src/routesConfiguration.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import { find } from 'lodash';
-import { Redirect } from 'react-router';
+import { Redirect } from 'react-router-dom';
 
 // This will change to `matchPath` soonish
-import matchPattern from 'react-router/matchPattern';
+import matchPattern from 'react-router-dom/matchPattern';
 
 import pathToRegexp from 'path-to-regexp';
 import {
diff --git a/src/util/test-helpers.js b/src/util/test-helpers.js
index f313d436..e2021dac 100644
--- a/src/util/test-helpers.js
+++ b/src/util/test-helpers.js
@@ -3,7 +3,7 @@ import renderer from 'react-test-renderer';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { IntlProvider } from 'react-intl';
-import { BrowserRouter } from 'react-router';
+import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import configureStore from '../store';