diff --git a/modules/client.js b/modules/client.js
index 7c66ef5..153eb1e 100644
--- a/modules/client.js
+++ b/modules/client.js
@@ -1,7 +1,6 @@
 import React from 'react'
-import { match, Router } from 'react-router'
+import { match, Router, browserHistory } from 'react-router'
 import { render } from 'react-dom'
-import { createHistory } from 'history'
 import routes from './routes/RootRoute'
 
 const { pathname, search, hash } = window.location
@@ -11,8 +10,7 @@ const location = `${pathname}${search}${hash}`
 // loading route/component code for the initial location
 match({ routes, location }, () => {
   render(
-    <Router routes={routes} history={createHistory()} />,
+    <Router routes={routes} history={browserHistory} />,
     document.getElementById('app')
   )
 })
-
diff --git a/modules/server.js b/modules/server.js
index 88050ec..c9de0e8 100644
--- a/modules/server.js
+++ b/modules/server.js
@@ -1,7 +1,7 @@
 import http from 'http'
 import React from 'react'
 import { renderToString } from 'react-dom/server'
-import { match, RoutingContext } from 'react-router'
+import { match, RouterContext } from 'react-router'
 import fs from 'fs'
 import { createPage, write, writeError, writeNotFound, redirect } from './utils/server-utils'
 import routes from './routes/RootRoute'
@@ -9,7 +9,7 @@ import routes from './routes/RootRoute'
 const PORT = process.env.PORT || 5000
 
 function renderApp(props, res) {
-  const markup = renderToString(<RoutingContext {...props}/>)
+  const markup = renderToString(<RouterContext {...props}/>)
   const html = createPage(markup)
   write(html, 'text/html', res)
 }
@@ -43,4 +43,3 @@ http.createServer((req, res) => {
 
 }).listen(PORT)
 console.log(`listening on port ${PORT}`)
-
diff --git a/package.json b/package.json
index 8c36b44..28f9725 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "history": "^1.13.1",
     "react": "^0.14.2",
     "react-dom": "^0.14.2",
-    "react-router": "^1.0.0",
+    "react-router": "^2.0.0-rc4",
     "webpack": "^1.12.6"
   },
   "scripts": {