diff --git a/packages/react-router-config/modules/__tests__/renderRoutes-test.js b/packages/react-router-config/modules/__tests__/renderRoutes-test.js
index 9e95d70c45..19b161678c 100644
--- a/packages/react-router-config/modules/__tests__/renderRoutes-test.js
+++ b/packages/react-router-config/modules/__tests__/renderRoutes-test.js
@@ -6,7 +6,7 @@ import StaticRouter from 'react-router/StaticRouter'
 
 describe('renderRoutes', () => {
   let rendered
-  const Comp = ({ match, route, route: { routes } }) => (
+  const Comp = ({ route, route: { routes } }) => (
     rendered.push(route),
     renderRoutes(routes)
   )
@@ -37,7 +37,7 @@ describe('renderRoutes', () => {
         path: '/'
       }
       const routes = [routeToMatch, {
-        component: Comp,
+        component: Comp
       }]
 
       renderToString(
@@ -52,7 +52,7 @@ describe('renderRoutes', () => {
     it('renders the first matched route in nested routes', () => {
       const childRouteToMatch = {
         component: Comp,
-        path: '/',
+        path: '/'
       }
       const routeToMatch = {
         component: Comp,
@@ -62,7 +62,7 @@ describe('renderRoutes', () => {
         }]
       }
       const routes = [routeToMatch, {
-        component: Comp,
+        component: Comp
       }]
 
       renderToString(
diff --git a/packages/react-router-dom/modules/BrowserRouter.js b/packages/react-router-dom/modules/BrowserRouter.js
index f4762e019a..a11c649a79 100644
--- a/packages/react-router-dom/modules/BrowserRouter.js
+++ b/packages/react-router-dom/modules/BrowserRouter.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import createHistory from 'history/createBrowserHistory'
 import { Router } from 'react-router'
 
diff --git a/packages/react-router-dom/modules/HashRouter.js b/packages/react-router-dom/modules/HashRouter.js
index a14f8b482e..a0ec600d62 100644
--- a/packages/react-router-dom/modules/HashRouter.js
+++ b/packages/react-router-dom/modules/HashRouter.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import createHistory from 'history/createHashHistory'
 import { Router } from 'react-router'
 
diff --git a/packages/react-router-dom/modules/Link.js b/packages/react-router-dom/modules/Link.js
index cdf98f7e1f..c614dd3e65 100644
--- a/packages/react-router-dom/modules/Link.js
+++ b/packages/react-router-dom/modules/Link.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 
 const isModifiedEvent = (event) =>
   !!(event.metaKey || event.altKey || event.ctrlKey || event.shiftKey)
diff --git a/packages/react-router-dom/modules/NavLink.js b/packages/react-router-dom/modules/NavLink.js
index 62659ec47e..5f095ffbfa 100644
--- a/packages/react-router-dom/modules/NavLink.js
+++ b/packages/react-router-dom/modules/NavLink.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import { Route } from 'react-router'
 import Link from './Link'
 
diff --git a/packages/react-router-dom/modules/__tests__/BrowserRouter-test.js b/packages/react-router-dom/modules/__tests__/BrowserRouter-test.js
index bdc30bb4d2..91ec7d3872 100644
--- a/packages/react-router-dom/modules/__tests__/BrowserRouter-test.js
+++ b/packages/react-router-dom/modules/__tests__/BrowserRouter-test.js
@@ -1,5 +1,6 @@
 import expect from 'expect'
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import ReactDOM from 'react-dom'
 import BrowserRouter from '../BrowserRouter'
 
diff --git a/packages/react-router-dom/modules/__tests__/HashRouter-test.js b/packages/react-router-dom/modules/__tests__/HashRouter-test.js
index f46e1de214..59d6655693 100644
--- a/packages/react-router-dom/modules/__tests__/HashRouter-test.js
+++ b/packages/react-router-dom/modules/__tests__/HashRouter-test.js
@@ -1,5 +1,6 @@
 import expect from 'expect'
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import ReactDOM from 'react-dom'
 import HashRouter from '../HashRouter'
 
diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json
index 6202f70a19..aec621d0a1 100644
--- a/packages/react-router-dom/package.json
+++ b/packages/react-router-dom/package.json
@@ -37,6 +37,7 @@
     "test": "karma start --single-run"
   },
   "peerDependencies": {
+    "prop-types": "^15",
     "react": "^15"
   },
   "dependencies": {
@@ -68,6 +69,7 @@
     "karma-webpack": "^1.7.0",
     "mocha": "^2.5.3",
     "pretty-bytes": "^3.0.1",
+    "prop-types": "^15.5.4",
     "react": "^15.4.2",
     "react-addons-test-utils": "^15.4.2",
     "react-dom": "^15.3.0",
diff --git a/packages/react-router-native/AndroidBackButton.js b/packages/react-router-native/AndroidBackButton.js
index 5ca386f3ae..90738d2013 100644
--- a/packages/react-router-native/AndroidBackButton.js
+++ b/packages/react-router-native/AndroidBackButton.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { BackAndroid } from 'react-native'
 
 class AndroidBackButton extends Component {
diff --git a/packages/react-router-native/DeepLinking.js b/packages/react-router-native/DeepLinking.js
index 263899976d..70847a1105 100644
--- a/packages/react-router-native/DeepLinking.js
+++ b/packages/react-router-native/DeepLinking.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Linking } from 'react-native'
 
 const regex = /.*?:\/\//g
diff --git a/packages/react-router-native/Link.js b/packages/react-router-native/Link.js
index c5f188d691..cde6c9f30a 100644
--- a/packages/react-router-native/Link.js
+++ b/packages/react-router-native/Link.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { TouchableHighlight } from 'react-native'
 
 class Link extends Component {
diff --git a/packages/react-router-native/NativeRouter.js b/packages/react-router-native/NativeRouter.js
index dfe46879c4..c2b3ad1312 100644
--- a/packages/react-router-native/NativeRouter.js
+++ b/packages/react-router-native/NativeRouter.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import MemoryRouter from 'react-router/MemoryRouter'
 import { Alert } from 'react-native'
 
diff --git a/packages/react-router-native/examples/ExperimentalExample.js b/packages/react-router-native/examples/ExperimentalExample.js
index a175ce2770..2d85e8ef24 100644
--- a/packages/react-router-native/examples/ExperimentalExample.js
+++ b/packages/react-router-native/examples/ExperimentalExample.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import {
   Text,
   View,
diff --git a/packages/react-router-native/experimental/StackRoute.js b/packages/react-router-native/experimental/StackRoute.js
index 12b3db134c..f5a2363a98 100644
--- a/packages/react-router-native/experimental/StackRoute.js
+++ b/packages/react-router-native/experimental/StackRoute.js
@@ -5,7 +5,8 @@
 // Any help cleaning it up would be appreciated.
 // <3 <3 <3 - Ryan
 
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import {
   Text,
diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json
index 7e35e57e44..5e35c7e089 100644
--- a/packages/react-router-native/package.json
+++ b/packages/react-router-native/package.json
@@ -15,6 +15,7 @@
     "experimental/TabRoutes.js"
   ],
   "peerDependencies": {
+    "prop-types": "^15",
     "react": "^15",
     "react-native": ">=0.40"
   },
@@ -25,6 +26,7 @@
     "babel-jest": "18.0.0",
     "babel-preset-react-native": "1.9.1",
     "jest": "18.1.0",
+    "prop-types": "^15.5.4",
     "react": "15.4.1",
     "react-native": "0.42.0",
     "react-test-renderer": "~15.4.0-rc.4"
diff --git a/packages/react-router-redux/modules/ConnectedRouter.js b/packages/react-router-redux/modules/ConnectedRouter.js
index 33fa408a39..371947f690 100644
--- a/packages/react-router-redux/modules/ConnectedRouter.js
+++ b/packages/react-router-redux/modules/ConnectedRouter.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Router } from 'react-router'
 
 import { LOCATION_CHANGE } from './reducer'
diff --git a/packages/react-router-redux/package.json b/packages/react-router-redux/package.json
index de9ef9c12d..246363745e 100644
--- a/packages/react-router-redux/package.json
+++ b/packages/react-router-redux/package.json
@@ -28,6 +28,7 @@
     "test": "jest"
   },
   "peerDependencies": {
+    "prop-types": "^15",
     "react": "^15"
   },
   "dependencies": {
@@ -50,6 +51,7 @@
     "in-publish": "^2.0.0",
     "jest": "^19.0.2",
     "pretty-bytes": "^4.0.2",
+    "prop-types": "^15.5.4",
     "react": "^15.4.2",
     "react-dom": "^15.4.2",
     "react-redux": "^5.0.3",
diff --git a/packages/react-router-redux/rollup.config.js b/packages/react-router-redux/rollup.config.js
index 1f66a9f923..64162886d0 100644
--- a/packages/react-router-redux/rollup.config.js
+++ b/packages/react-router-redux/rollup.config.js
@@ -11,10 +11,12 @@ var config = {
   ],
   external: [
     'react',
+    'prop-types',
     'react-router'
   ],
   globals: {
     react: 'React',
+    'prop-types': 'PropTypes',
     'react-router': 'ReactRouter'
   }
 }
diff --git a/packages/react-router-website/modules/components/API.js b/packages/react-router-website/modules/components/API.js
index 3fa81480e2..18f9340e20 100644
--- a/packages/react-router-website/modules/components/API.js
+++ b/packages/react-router-website/modules/components/API.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Redirect } from 'react-router-dom'
 import { Block } from 'jsxstyle'
 import ScrollToDoc from './ScrollToDoc'
diff --git a/packages/react-router-website/modules/components/APISmall.js b/packages/react-router-website/modules/components/APISmall.js
index 5681a1336a..5133d2d79a 100644
--- a/packages/react-router-website/modules/components/APISmall.js
+++ b/packages/react-router-website/modules/components/APISmall.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Redirect, Route } from 'react-router-dom'
 import { Block } from 'jsxstyle'
 import ScrollToDoc from './ScrollToDoc'
diff --git a/packages/react-router-website/modules/components/DelegateMarkdownLinks.js b/packages/react-router-website/modules/components/DelegateMarkdownLinks.js
index 9e8d7e2ba7..28c26ee81e 100644
--- a/packages/react-router-website/modules/components/DelegateMarkdownLinks.js
+++ b/packages/react-router-website/modules/components/DelegateMarkdownLinks.js
@@ -1,4 +1,5 @@
-import { Component, PropTypes } from 'react'
+import { Component } from 'react'
+import PropTypes from 'prop-types'
 import { withRouter } from 'react-router-dom'
 
 let delegate = (history) => {
diff --git a/packages/react-router-website/modules/components/Environment.js b/packages/react-router-website/modules/components/Environment.js
index d21ea47dbc..8d9f90d0ad 100644
--- a/packages/react-router-website/modules/components/Environment.js
+++ b/packages/react-router-website/modules/components/Environment.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import EnvironmentLarge from './EnvironmentLarge'
 import EnvironmentSmall from './EnvironmentSmall'
 import Bundle from './Bundle'
diff --git a/packages/react-router-website/modules/components/EnvironmentHeader.js b/packages/react-router-website/modules/components/EnvironmentHeader.js
index 1a2e0a962b..bb33c014cc 100644
--- a/packages/react-router-website/modules/components/EnvironmentHeader.js
+++ b/packages/react-router-website/modules/components/EnvironmentHeader.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import { Block, Row, Inline, Col } from 'jsxstyle'
 import { Link, Route } from 'react-router-dom'
 import { LIGHT_GRAY, RED } from '../Theme'
diff --git a/packages/react-router-website/modules/components/EnvironmentLarge.js b/packages/react-router-website/modules/components/EnvironmentLarge.js
index ea078f2758..78d07da30b 100644
--- a/packages/react-router-website/modules/components/EnvironmentLarge.js
+++ b/packages/react-router-website/modules/components/EnvironmentLarge.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Block, InlineBlock } from 'jsxstyle'
 import { Link, Route, Redirect, Switch } from 'react-router-dom'
 import { LIGHT_GRAY, RED } from '../Theme'
diff --git a/packages/react-router-website/modules/components/EnvironmentSmall.js b/packages/react-router-website/modules/components/EnvironmentSmall.js
index fcf3febe32..6c8e7a04b2 100644
--- a/packages/react-router-website/modules/components/EnvironmentSmall.js
+++ b/packages/react-router-website/modules/components/EnvironmentSmall.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Block, Col } from 'jsxstyle'
 import EnvironmentHeader from './EnvironmentHeader'
 import { Link, Switch, Route } from 'react-router-dom'
diff --git a/packages/react-router-website/modules/components/Example.js b/packages/react-router-website/modules/components/Example.js
index e1ff345b85..9eacbf8292 100644
--- a/packages/react-router-website/modules/components/Example.js
+++ b/packages/react-router-website/modules/components/Example.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import WebExample from './WebExample'
 import NativeExample from './NativeExample'
 import { Redirect } from 'react-router-dom'
diff --git a/packages/react-router-website/modules/components/FakeBrowser.js b/packages/react-router-website/modules/components/FakeBrowser.js
index 945e11f141..b0eefd60c9 100644
--- a/packages/react-router-website/modules/components/FakeBrowser.js
+++ b/packages/react-router-website/modules/components/FakeBrowser.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import { MemoryRouter, Route } from 'react-router-dom'
 import { Block, Col, Row } from 'jsxstyle'
 import { LIGHT_GRAY, GRAY } from '../Theme'
diff --git a/packages/react-router-website/modules/components/Guide.js b/packages/react-router-website/modules/components/Guide.js
index 724382cd1e..c110374821 100644
--- a/packages/react-router-website/modules/components/Guide.js
+++ b/packages/react-router-website/modules/components/Guide.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import { Redirect, Route } from 'react-router-dom'
 import { Block } from 'jsxstyle'
 import ScrollToDoc from './ScrollToDoc'
diff --git a/packages/react-router-website/modules/components/MarkdownViewer.js b/packages/react-router-website/modules/components/MarkdownViewer.js
index 785abc86af..b968dde132 100644
--- a/packages/react-router-website/modules/components/MarkdownViewer.js
+++ b/packages/react-router-website/modules/components/MarkdownViewer.js
@@ -1,5 +1,6 @@
 /*eslint react/no-danger:0 */
 import React from 'react'
+import PropTypes from 'prop-types'
 import 'prismjs/themes/prism-tomorrow.css'
 
 const MarkdownViewer = ({ html, id }) => (
@@ -11,7 +12,7 @@ const MarkdownViewer = ({ html, id }) => (
 )
 
 MarkdownViewer.propTypes = {
-  html: React.PropTypes.string.isRequired
+  html: PropTypes.string.isRequired
 }
 
 export default MarkdownViewer
diff --git a/packages/react-router-website/modules/components/NativeExample.js b/packages/react-router-website/modules/components/NativeExample.js
index c0144ff21c..a2335ab7b1 100644
--- a/packages/react-router-website/modules/components/NativeExample.js
+++ b/packages/react-router-website/modules/components/NativeExample.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import Media from 'react-media'
 import { Block, Col } from 'jsxstyle'
 import Bundle from './Bundle'
diff --git a/packages/react-router-website/modules/components/NewsletterSignup.js b/packages/react-router-website/modules/components/NewsletterSignup.js
index 4b9f89863c..e526600cf1 100644
--- a/packages/react-router-website/modules/components/NewsletterSignup.js
+++ b/packages/react-router-website/modules/components/NewsletterSignup.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Block, Flex } from 'jsxstyle'
 import { RED } from '../Theme'
 import SmallScreen from './SmallScreen'
diff --git a/packages/react-router-website/modules/components/PanGesture.js b/packages/react-router-website/modules/components/PanGesture.js
index 2d89bfb18b..8e55e54e2c 100644
--- a/packages/react-router-website/modules/components/PanGesture.js
+++ b/packages/react-router-website/modules/components/PanGesture.js
@@ -1,6 +1,7 @@
 // Thanks @iammerrick! <3 <3 <3
 
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { findDOMNode } from 'react-dom'
 
 const getPointRelativeToElement = (point, element) => {
diff --git a/packages/react-router-website/modules/components/ScrollToDoc.js b/packages/react-router-website/modules/components/ScrollToDoc.js
index d95601a23e..bbdd2363a1 100644
--- a/packages/react-router-website/modules/components/ScrollToDoc.js
+++ b/packages/react-router-website/modules/components/ScrollToDoc.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Motion, spring } from 'react-motion'
 
 class ScrollY extends Component {
diff --git a/packages/react-router-website/modules/components/SourceViewer.js b/packages/react-router-website/modules/components/SourceViewer.js
index 622236da00..e10abe3084 100644
--- a/packages/react-router-website/modules/components/SourceViewer.js
+++ b/packages/react-router-website/modules/components/SourceViewer.js
@@ -1,5 +1,6 @@
 /*eslint-disable react/no-danger*/
 import React from 'react'
+import PropTypes from 'prop-types'
 import 'prismjs/themes/prism-tomorrow.css'
 import { Block } from 'jsxstyle'
 
@@ -17,7 +18,7 @@ const SourceViewer = ({ code, ...rest }) => (
 )
 
 SourceViewer.propTypes = {
-  code: React.PropTypes.string.isRequired
+  code: PropTypes.string.isRequired
 }
 
 export default SourceViewer
diff --git a/packages/react-router-website/modules/components/WebExample.js b/packages/react-router-website/modules/components/WebExample.js
index edd1fe7740..a15772ce26 100644
--- a/packages/react-router-website/modules/components/WebExample.js
+++ b/packages/react-router-website/modules/components/WebExample.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import Media from 'react-media'
 import { Block } from 'jsxstyle'
 import { Route } from 'react-router-dom'
diff --git a/packages/react-router-website/modules/examples/Auth.js b/packages/react-router-website/modules/examples/Auth.js
index 82a3e6c913..1361427f0c 100644
--- a/packages/react-router-website/modules/examples/Auth.js
+++ b/packages/react-router-website/modules/examples/Auth.js
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
 import {
   BrowserRouter as Router,
   Route,
diff --git a/packages/react-router-website/package.json b/packages/react-router-website/package.json
index f541d03551..7c05b3a806 100644
--- a/packages/react-router-website/package.json
+++ b/packages/react-router-website/package.json
@@ -28,6 +28,7 @@
     "markdown-it-anchor": "^3.0.0",
     "postcss-loader": "0.9.1",
     "prismjs-loader": "0.0.3",
+    "prop-types": "^15.5.4",
     "react": "^15.4.0",
     "react-addons-css-transition-group": "^15.4.2",
     "react-dom": "^15.4.0",
diff --git a/packages/react-router/modules/.eslintrc b/packages/react-router/modules/.eslintrc
index 060f59f120..baa7a5f208 100644
--- a/packages/react-router/modules/.eslintrc
+++ b/packages/react-router/modules/.eslintrc
@@ -14,6 +14,7 @@
     "plugin:react/recommended"
   ],
   "rules": {
+    "no-unused-vars": [ 2, { "ignoreRestSiblings": true }],
     "prefer-arrow-callback": 2,
     "react/display-name": 0,
     "semi": [ 2, "never" ]
diff --git a/packages/react-router/modules/MemoryRouter.js b/packages/react-router/modules/MemoryRouter.js
index 44d529d124..75040b1391 100644
--- a/packages/react-router/modules/MemoryRouter.js
+++ b/packages/react-router/modules/MemoryRouter.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import createHistory from 'history/createMemoryHistory'
 import Router from './Router'
 
diff --git a/packages/react-router/modules/Prompt.js b/packages/react-router/modules/Prompt.js
index 5ea96d3caf..3c875798b6 100644
--- a/packages/react-router/modules/Prompt.js
+++ b/packages/react-router/modules/Prompt.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 
 /**
  * The public API for prompting the user before navigating away
diff --git a/packages/react-router/modules/Redirect.js b/packages/react-router/modules/Redirect.js
index edbe984897..416c923e6c 100644
--- a/packages/react-router/modules/Redirect.js
+++ b/packages/react-router/modules/Redirect.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 
 /**
  * The public API for updating the location programatically
diff --git a/packages/react-router/modules/Route.js b/packages/react-router/modules/Route.js
index 07940797ae..a6410c8937 100644
--- a/packages/react-router/modules/Route.js
+++ b/packages/react-router/modules/Route.js
@@ -1,5 +1,6 @@
 import warning from 'warning'
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import matchPath from './matchPath'
 
 /**
@@ -33,7 +34,6 @@ class Route extends React.Component {
   }
 
   getChildContext() {
-    const { router } = this.context
     return {
       router: {
         ...this.context.router,
diff --git a/packages/react-router/modules/Router.js b/packages/react-router/modules/Router.js
index f398aaa60e..3959d19f89 100644
--- a/packages/react-router/modules/Router.js
+++ b/packages/react-router/modules/Router.js
@@ -1,6 +1,7 @@
 import warning from 'warning'
 import invariant from 'invariant'
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 
 /**
  * The public API for putting history on context.
diff --git a/packages/react-router/modules/StaticRouter.js b/packages/react-router/modules/StaticRouter.js
index dcce150de1..364bc1cabc 100644
--- a/packages/react-router/modules/StaticRouter.js
+++ b/packages/react-router/modules/StaticRouter.js
@@ -1,5 +1,6 @@
 import invariant from 'invariant'
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import { addLeadingSlash, createPath, parsePath } from 'history/PathUtils'
 import Router from './Router'
 
diff --git a/packages/react-router/modules/Switch.js b/packages/react-router/modules/Switch.js
index 54911c228a..1fd43530e3 100644
--- a/packages/react-router/modules/Switch.js
+++ b/packages/react-router/modules/Switch.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import warning from 'warning'
 import matchPath from './matchPath'
 
diff --git a/packages/react-router/modules/__tests__/MemoryRouter-test.js b/packages/react-router/modules/__tests__/MemoryRouter-test.js
index aee4bfc6f6..bbaef77bd5 100644
--- a/packages/react-router/modules/__tests__/MemoryRouter-test.js
+++ b/packages/react-router/modules/__tests__/MemoryRouter-test.js
@@ -1,5 +1,6 @@
 import expect from 'expect'
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import ReactDOM from 'react-dom'
 import MemoryRouter from '../MemoryRouter'
 
diff --git a/packages/react-router/modules/__tests__/Router-test.js b/packages/react-router/modules/__tests__/Router-test.js
index 38745f0cab..057133f475 100644
--- a/packages/react-router/modules/__tests__/Router-test.js
+++ b/packages/react-router/modules/__tests__/Router-test.js
@@ -1,5 +1,6 @@
 import expect from 'expect'
 import React from 'react'
+import PropTypes from 'prop-types'
 import Router from '../Router'
 import ReactDOM from 'react-dom'
 import createHistory from 'history/createMemoryHistory'
@@ -57,9 +58,9 @@ describe('A <Router>', () => {
     }
 
     ContextChecker.contextTypes = {
-      router: React.PropTypes.shape({
-        history: React.PropTypes.object,
-        route: React.PropTypes.object
+      router: PropTypes.shape({
+        history: PropTypes.object,
+        route: PropTypes.object
       })
     }
 
diff --git a/packages/react-router/modules/__tests__/StaticRouter-test.js b/packages/react-router/modules/__tests__/StaticRouter-test.js
index 2d8676e0aa..7b426d6097 100644
--- a/packages/react-router/modules/__tests__/StaticRouter-test.js
+++ b/packages/react-router/modules/__tests__/StaticRouter-test.js
@@ -1,5 +1,6 @@
 import expect from 'expect'
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 import ReactDOMServer from 'react-dom/server'
 import ReactDOM from 'react-dom'
 import StaticRouter from '../StaticRouter'
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 1b68009b1e..4063e6b8c2 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -33,6 +33,7 @@
     "test": "karma start --single-run"
   },
   "peerDependencies": {
+    "prop-types": "^15",
     "react": "^15"
   },
   "dependencies": {
@@ -51,9 +52,9 @@
     "babel-preset-es2015": "^6.14.0",
     "babel-preset-react": "^6.5.0",
     "babel-preset-stage-1": "^6.5.0",
-    "eslint": "^2.13.1",
-    "eslint-plugin-import": "^1.15.0",
-    "eslint-plugin-react": "^5.2.2",
+    "eslint": "^3.19.0",
+    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-react": "^6.10.3",
     "expect": "^1.20.1",
     "gzip-size": "^3.0.0",
     "in-publish": "^2.0.0",
@@ -66,6 +67,7 @@
     "karma-webpack": "^1.7.0",
     "mocha": "^2.5.3",
     "pretty-bytes": "^3.0.1",
+    "prop-types": "^15.5.4",
     "react": "^15.4.2",
     "react-addons-test-utils": "^15.4.2",
     "react-dom": "^15.3.0",