diff --git a/docs/app/Components/ComponentDoc/ComponentDoc.js b/docs/app/Components/ComponentDoc/ComponentDoc.js
index 7169bb1327..475e794aca 100644
--- a/docs/app/Components/ComponentDoc/ComponentDoc.js
+++ b/docs/app/Components/ComponentDoc/ComponentDoc.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 import DocumentTitle from 'react-document-title'
 import { Link } from 'react-router-dom'
 
diff --git a/docs/app/Components/ComponentDoc/ComponentExample.js b/docs/app/Components/ComponentDoc/ComponentExample.js
index 804a3d6594..db8bce2750 100644
--- a/docs/app/Components/ComponentDoc/ComponentExample.js
+++ b/docs/app/Components/ComponentDoc/ComponentExample.js
@@ -1,6 +1,7 @@
 import * as Babel from 'babel-standalone'
 import _ from 'lodash'
-import React, { Component, createElement, isValidElement, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component, createElement, isValidElement } from 'react'
 import { withRouter } from 'react-router'
 import { renderToStaticMarkup } from 'react-dom/server'
 import { html } from 'js-beautify'
diff --git a/docs/app/Components/ComponentDoc/ComponentExamples.js b/docs/app/Components/ComponentDoc/ComponentExamples.js
index 113a0fdba1..6f5908eaa7 100644
--- a/docs/app/Components/ComponentDoc/ComponentExamples.js
+++ b/docs/app/Components/ComponentDoc/ComponentExamples.js
@@ -1,5 +1,6 @@
 import _ from 'lodash'
-import React, { Component, createElement, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component, createElement } from 'react'
 
 import { exampleContext } from 'docs/app/utils'
 import { Grid } from 'src'
diff --git a/docs/app/Components/ComponentDoc/ComponentProps.js b/docs/app/Components/ComponentDoc/ComponentProps.js
index 63bc7d16d9..0c47ffc10a 100644
--- a/docs/app/Components/ComponentDoc/ComponentProps.js
+++ b/docs/app/Components/ComponentDoc/ComponentProps.js
@@ -1,5 +1,6 @@
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import { Header, Icon, Popup, Table } from 'src'
 import { SUI } from 'src/lib'
diff --git a/docs/app/Components/ComponentDoc/ContributionPrompt.js b/docs/app/Components/ComponentDoc/ContributionPrompt.js
index 907ed45c47..7bff3a7e1f 100644
--- a/docs/app/Components/ComponentDoc/ContributionPrompt.js
+++ b/docs/app/Components/ComponentDoc/ContributionPrompt.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import { repoURL } from 'docs/app/utils'
 import { Message, Icon } from 'src'
diff --git a/docs/app/Components/ComponentDoc/ExampleSection.js b/docs/app/Components/ComponentDoc/ExampleSection.js
index bf3082562a..9e0141e96c 100644
--- a/docs/app/Components/ComponentDoc/ExampleSection.js
+++ b/docs/app/Components/ComponentDoc/ExampleSection.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import { Grid, Header } from 'src'
 
diff --git a/docs/app/Components/Editor/Editor.js b/docs/app/Components/Editor/Editor.js
index 72b62e8f6b..9e48264d74 100644
--- a/docs/app/Components/Editor/Editor.js
+++ b/docs/app/Components/Editor/Editor.js
@@ -1,5 +1,6 @@
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 import AceEditor from 'react-ace'
 import ace from 'brace'
 import 'brace/ext/language_tools'
diff --git a/docs/app/Components/ExternalExampleLayout.js b/docs/app/Components/ExternalExampleLayout.js
index 72d06451b3..d328b9717e 100644
--- a/docs/app/Components/ExternalExampleLayout.js
+++ b/docs/app/Components/ExternalExampleLayout.js
@@ -1,5 +1,6 @@
 import _ from 'lodash/fp'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import PageNotFound from '../Views/PageNotFound'
 import { exampleContext } from 'docs/app/utils'
diff --git a/docs/app/Components/Layout.js b/docs/app/Components/Layout.js
index a7c438ee6a..a0955abdc7 100644
--- a/docs/app/Components/Layout.js
+++ b/docs/app/Components/Layout.js
@@ -1,5 +1,6 @@
 import AnchorJS from 'anchor-js'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import Sidebar from 'docs/app/Components/Sidebar/Sidebar'
 import style from 'docs/app/Style'
diff --git a/docs/app/Components/Logo/Logo.js b/docs/app/Components/Logo/Logo.js
index b9ff73f244..38c7ab8431 100644
--- a/docs/app/Components/Logo/Logo.js
+++ b/docs/app/Components/Logo/Logo.js
@@ -1,5 +1,4 @@
 import React from 'react'
-
 import { Image } from 'src'
 
 const Logo = (props) => <Image {...props} src='/logo.png' />
diff --git a/docs/app/Components/Root.js b/docs/app/Components/Root.js
index 2121ea6438..09f24690e1 100644
--- a/docs/app/Components/Root.js
+++ b/docs/app/Components/Root.js
@@ -1,5 +1,6 @@
 import _ from 'lodash/fp'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import ComponentDoc from '../Components/ComponentDoc/ComponentDoc'
 import { META } from 'src/lib'
diff --git a/docs/app/Components/Sidebar/Sidebar.js b/docs/app/Components/Sidebar/Sidebar.js
index 035fa75f93..c404ae2fc8 100644
--- a/docs/app/Components/Sidebar/Sidebar.js
+++ b/docs/app/Components/Sidebar/Sidebar.js
@@ -1,5 +1,6 @@
 import _ from 'lodash/fp'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 import { findDOMNode } from 'react-dom'
 import { NavLink } from 'react-router-dom'
 import { withRouter } from 'react-router'
diff --git a/docs/app/Examples/collections/Form/Shorthand/index.js b/docs/app/Examples/collections/Form/Shorthand/index.js
index a604bce050..e53f127790 100644
--- a/docs/app/Examples/collections/Form/Shorthand/index.js
+++ b/docs/app/Examples/collections/Form/Shorthand/index.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 import ExampleSection from 'docs/app/Components/ComponentDoc/ExampleSection'
 import ComponentExample from 'docs/app/Components/ComponentDoc/ComponentExample'
 
diff --git a/docs/app/Examples/collections/Menu/Variations/MenuExampleColoredInvertedMenus.js b/docs/app/Examples/collections/Menu/Variations/MenuExampleColoredInvertedMenus.js
index 8f05b2e18d..c132a82259 100644
--- a/docs/app/Examples/collections/Menu/Variations/MenuExampleColoredInvertedMenus.js
+++ b/docs/app/Examples/collections/Menu/Variations/MenuExampleColoredInvertedMenus.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 import { Menu } from 'semantic-ui-react'
 
 const colors = [
diff --git a/docs/app/Examples/collections/Menu/Variations/MenuExampleColoredMenus.js b/docs/app/Examples/collections/Menu/Variations/MenuExampleColoredMenus.js
index a9fbc64acf..60cd38a4e9 100644
--- a/docs/app/Examples/collections/Menu/Variations/MenuExampleColoredMenus.js
+++ b/docs/app/Examples/collections/Menu/Variations/MenuExampleColoredMenus.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 import { Menu } from 'semantic-ui-react'
 
 const colors = [
diff --git a/docs/app/Examples/elements/Rail/Variations/RailExampleSize.js b/docs/app/Examples/elements/Rail/Variations/RailExampleSize.js
index 304014877d..2e7f46f87e 100644
--- a/docs/app/Examples/elements/Rail/Variations/RailExampleSize.js
+++ b/docs/app/Examples/elements/Rail/Variations/RailExampleSize.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 import { Grid, Image, Rail, Segment } from 'semantic-ui-react'
 
 const Wrapper = ({ children }) => (
diff --git a/docs/app/Examples/modules/Search/Types/SearchExampleCategoryCustom.js b/docs/app/Examples/modules/Search/Types/SearchExampleCategoryCustom.js
index 7f29c45e14..dce44da82f 100644
--- a/docs/app/Examples/modules/Search/Types/SearchExampleCategoryCustom.js
+++ b/docs/app/Examples/modules/Search/Types/SearchExampleCategoryCustom.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 import { Label } from 'semantic-ui-react'
 
 import SearchExampleCategory from './SearchExampleCategory'
diff --git a/docs/app/Examples/modules/Search/Types/SearchExampleStandardCustom.js b/docs/app/Examples/modules/Search/Types/SearchExampleStandardCustom.js
index 391c721e49..b958144bf9 100644
--- a/docs/app/Examples/modules/Search/Types/SearchExampleStandardCustom.js
+++ b/docs/app/Examples/modules/Search/Types/SearchExampleStandardCustom.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 import { Label } from 'semantic-ui-react'
 
 import SearchExampleStandard from './SearchExampleStandard'
diff --git a/docs/app/Views/Introduction.js b/docs/app/Views/Introduction.js
index 572b71e543..0a7c8dde0b 100644
--- a/docs/app/Views/Introduction.js
+++ b/docs/app/Views/Introduction.js
@@ -1,5 +1,7 @@
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 import { Link } from 'react-router-dom'
+
 import Editor from 'docs/app/Components/Editor/Editor'
 import pkg from 'package.json'
 import {
diff --git a/docs/app/index.ejs b/docs/app/index.ejs
index 924fec2b14..6a4fe7b527 100644
--- a/docs/app/index.ejs
+++ b/docs/app/index.ejs
@@ -64,6 +64,7 @@
   <script src="//cdn.jsdelivr.net/faker.js/<%= htmlWebpackPlugin.options.versions.faker %>/faker.min.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/js-beautify/<%= htmlWebpackPlugin.options.versions.jsBeautify %>/beautify-html.min.js"></script>
   <!-- Use unminified React when not in production so we get errors and warnings -->
+  <script src="//unpkg.com/prop-types@<%= htmlWebpackPlugin.options.versions.propTypes %>/prop-types.min.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/react/<%= htmlWebpackPlugin.options.versions.react %>/react<%= __PROD__ ? '.min' : '' %>.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/react/<%= htmlWebpackPlugin.options.versions.reactDOM %>/react-dom.min.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/react/<%= htmlWebpackPlugin.options.versions.reactDOM %>/react-dom-server.min.js"></script>
diff --git a/package.json b/package.json
index 85719641e1..7c0b38931b 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,8 @@
     "babel-runtime": "^6.22.0",
     "classnames": "^2.1.5",
     "debug": "^2.6.3",
-    "lodash": "^4.17.2"
+    "lodash": "^4.17.2",
+    "prop-types": "^15.5.7"
   },
   "devDependencies": {
     "@types/react": "^15.0.14",
diff --git a/src/addons/Confirm/Confirm.js b/src/addons/Confirm/Confirm.js
index efdc80e429..b4958b9698 100644
--- a/src/addons/Confirm/Confirm.js
+++ b/src/addons/Confirm/Confirm.js
@@ -1,5 +1,6 @@
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   customPropTypes,
diff --git a/src/addons/Portal/Portal.js b/src/addons/Portal/Portal.js
index 751b847a47..9740947b10 100644
--- a/src/addons/Portal/Portal.js
+++ b/src/addons/Portal/Portal.js
@@ -1,5 +1,6 @@
 import _ from 'lodash'
-import { Children, cloneElement, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import { Children, cloneElement } from 'react'
 import ReactDOM from 'react-dom'
 
 import {
diff --git a/src/addons/TextArea/TextArea.js b/src/addons/TextArea/TextArea.js
index a4e606ff13..0fb75739ca 100644
--- a/src/addons/TextArea/TextArea.js
+++ b/src/addons/TextArea/TextArea.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 import {
   customPropTypes,
   getElementType,
diff --git a/src/collections/Breadcrumb/Breadcrumb.js b/src/collections/Breadcrumb/Breadcrumb.js
index 989acd0c22..85f3fd4055 100644
--- a/src/collections/Breadcrumb/Breadcrumb.js
+++ b/src/collections/Breadcrumb/Breadcrumb.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Breadcrumb/BreadcrumbDivider.js b/src/collections/Breadcrumb/BreadcrumbDivider.js
index 5fe1cba7da..8e29425137 100644
--- a/src/collections/Breadcrumb/BreadcrumbDivider.js
+++ b/src/collections/Breadcrumb/BreadcrumbDivider.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/collections/Breadcrumb/BreadcrumbSection.js b/src/collections/Breadcrumb/BreadcrumbSection.js
index e9e2cdb22d..f71b158321 100644
--- a/src/collections/Breadcrumb/BreadcrumbSection.js
+++ b/src/collections/Breadcrumb/BreadcrumbSection.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/collections/Form/Form.js b/src/collections/Form/Form.js
index 0188fbd4b9..56323cdf1a 100644
--- a/src/collections/Form/Form.js
+++ b/src/collections/Form/Form.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Form/FormField.js b/src/collections/Form/FormField.js
index 5a2dae2d5a..8df69c9675 100644
--- a/src/collections/Form/FormField.js
+++ b/src/collections/Form/FormField.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { createElement, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { createElement } from 'react'
 
 import {
   createHTMLLabel,
diff --git a/src/collections/Form/FormGroup.js b/src/collections/Form/FormGroup.js
index 56781061e9..9f1a0bf2d9 100644
--- a/src/collections/Form/FormGroup.js
+++ b/src/collections/Form/FormGroup.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Grid/Grid.js b/src/collections/Grid/Grid.js
index 8023a683fa..c535f8568f 100644
--- a/src/collections/Grid/Grid.js
+++ b/src/collections/Grid/Grid.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Grid/GridColumn.js b/src/collections/Grid/GridColumn.js
index e22f217aef..1465b9e49f 100644
--- a/src/collections/Grid/GridColumn.js
+++ b/src/collections/Grid/GridColumn.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Grid/GridRow.js b/src/collections/Grid/GridRow.js
index 9bcd696e38..d5a5cb3edf 100644
--- a/src/collections/Grid/GridRow.js
+++ b/src/collections/Grid/GridRow.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Menu/Menu.js b/src/collections/Menu/Menu.js
index 7fe27edfd3..3d41262130 100644
--- a/src/collections/Menu/Menu.js
+++ b/src/collections/Menu/Menu.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   AutoControlledComponent as Component,
diff --git a/src/collections/Menu/MenuHeader.js b/src/collections/Menu/MenuHeader.js
index bb0492b01b..7c7a296d4d 100644
--- a/src/collections/Menu/MenuHeader.js
+++ b/src/collections/Menu/MenuHeader.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Menu/MenuItem.js b/src/collections/Menu/MenuItem.js
index 48352002eb..7ed9c50111 100644
--- a/src/collections/Menu/MenuItem.js
+++ b/src/collections/Menu/MenuItem.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/collections/Menu/MenuMenu.js b/src/collections/Menu/MenuMenu.js
index 60b9a2eff0..33cecc3512 100644
--- a/src/collections/Menu/MenuMenu.js
+++ b/src/collections/Menu/MenuMenu.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Message/Message.js b/src/collections/Message/Message.js
index 55ffee8358..a30635b396 100644
--- a/src/collections/Message/Message.js
+++ b/src/collections/Message/Message.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   createHTMLParagraph,
diff --git a/src/collections/Message/MessageContent.js b/src/collections/Message/MessageContent.js
index cc99b5e387..ba3929b93d 100644
--- a/src/collections/Message/MessageContent.js
+++ b/src/collections/Message/MessageContent.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Message/MessageHeader.js b/src/collections/Message/MessageHeader.js
index aba0db0ac1..81afe8917d 100644
--- a/src/collections/Message/MessageHeader.js
+++ b/src/collections/Message/MessageHeader.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/collections/Message/MessageItem.js b/src/collections/Message/MessageItem.js
index 366ce51e17..7cf380046f 100644
--- a/src/collections/Message/MessageItem.js
+++ b/src/collections/Message/MessageItem.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/collections/Message/MessageList.js b/src/collections/Message/MessageList.js
index ebecff0d87..d486a089c5 100644
--- a/src/collections/Message/MessageList.js
+++ b/src/collections/Message/MessageList.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/collections/Table/Table.js b/src/collections/Table/Table.js
index 9c207820d0..03bc000436 100644
--- a/src/collections/Table/Table.js
+++ b/src/collections/Table/Table.js
@@ -1,6 +1,7 @@
 import _ from 'lodash'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Table/TableBody.js b/src/collections/Table/TableBody.js
index f9c64e79c3..79a30f5276 100644
--- a/src/collections/Table/TableBody.js
+++ b/src/collections/Table/TableBody.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Table/TableCell.js b/src/collections/Table/TableCell.js
index c9fb3565ba..baf2b48e19 100644
--- a/src/collections/Table/TableCell.js
+++ b/src/collections/Table/TableCell.js
@@ -1,6 +1,7 @@
 import _ from 'lodash'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/collections/Table/TableHeader.js b/src/collections/Table/TableHeader.js
index 73ef7c4a71..e53e13009a 100644
--- a/src/collections/Table/TableHeader.js
+++ b/src/collections/Table/TableHeader.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Table/TableHeaderCell.js b/src/collections/Table/TableHeaderCell.js
index 892a5c6e50..d25e4381e8 100644
--- a/src/collections/Table/TableHeaderCell.js
+++ b/src/collections/Table/TableHeaderCell.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/collections/Table/TableRow.js b/src/collections/Table/TableRow.js
index 22d31b8a96..9b4ecebedd 100644
--- a/src/collections/Table/TableRow.js
+++ b/src/collections/Table/TableRow.js
@@ -1,6 +1,7 @@
 import _ from 'lodash'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/elements/Button/Button.js b/src/elements/Button/Button.js
index 52b82a650c..29775b0f53 100644
--- a/src/elements/Button/Button.js
+++ b/src/elements/Button/Button.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Button/ButtonContent.js b/src/elements/Button/ButtonContent.js
index 0368465772..b5aa08bf43 100644
--- a/src/elements/Button/ButtonContent.js
+++ b/src/elements/Button/ButtonContent.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Button/ButtonGroup.js b/src/elements/Button/ButtonGroup.js
index 8cfc85265e..bb4ae0ac7f 100644
--- a/src/elements/Button/ButtonGroup.js
+++ b/src/elements/Button/ButtonGroup.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Button/ButtonOr.js b/src/elements/Button/ButtonOr.js
index 8e563cdc59..82c70e01fb 100644
--- a/src/elements/Button/ButtonOr.js
+++ b/src/elements/Button/ButtonOr.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Container/Container.js b/src/elements/Container/Container.js
index 6a4a0759b4..b1bd62da09 100644
--- a/src/elements/Container/Container.js
+++ b/src/elements/Container/Container.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Divider/Divider.js b/src/elements/Divider/Divider.js
index 8bf9ab7522..3b3119b744 100644
--- a/src/elements/Divider/Divider.js
+++ b/src/elements/Divider/Divider.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Flag/Flag.js b/src/elements/Flag/Flag.js
index 201ca0093b..29e4f1932c 100644
--- a/src/elements/Flag/Flag.js
+++ b/src/elements/Flag/Flag.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/elements/Header/Header.js b/src/elements/Header/Header.js
index b88f01669c..603774bb93 100644
--- a/src/elements/Header/Header.js
+++ b/src/elements/Header/Header.js
@@ -1,6 +1,7 @@
 import _ from 'lodash'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Header/HeaderContent.js b/src/elements/Header/HeaderContent.js
index 12c2f7dd7f..3ad4c4313b 100644
--- a/src/elements/Header/HeaderContent.js
+++ b/src/elements/Header/HeaderContent.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Header/HeaderSubheader.js b/src/elements/Header/HeaderSubheader.js
index ddd577b288..b6c671756c 100644
--- a/src/elements/Header/HeaderSubheader.js
+++ b/src/elements/Header/HeaderSubheader.js
@@ -1,6 +1,7 @@
 import _ from 'lodash'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/elements/Icon/Icon.js b/src/elements/Icon/Icon.js
index 6cf90dcedf..6d22b58b2d 100644
--- a/src/elements/Icon/Icon.js
+++ b/src/elements/Icon/Icon.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/elements/Icon/IconGroup.js b/src/elements/Icon/IconGroup.js
index fba11f3c5c..086bcde5e4 100644
--- a/src/elements/Icon/IconGroup.js
+++ b/src/elements/Icon/IconGroup.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Image/Image.js b/src/elements/Image/Image.js
index 778189618a..dc49db0bff 100644
--- a/src/elements/Image/Image.js
+++ b/src/elements/Image/Image.js
@@ -1,6 +1,7 @@
 import _ from 'lodash'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/elements/Image/ImageGroup.js b/src/elements/Image/ImageGroup.js
index a8ce3cc9c1..9a27676d68 100644
--- a/src/elements/Image/ImageGroup.js
+++ b/src/elements/Image/ImageGroup.js
@@ -1,5 +1,6 @@
-import React, { PropTypes } from 'react'
 import cx from 'classnames'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Input/Input.js b/src/elements/Input/Input.js
index 4c23b84c67..504b5722b1 100644
--- a/src/elements/Input/Input.js
+++ b/src/elements/Input/Input.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Children, cloneElement, Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Children, cloneElement, Component } from 'react'
 
 import {
   createHTMLInput,
diff --git a/src/elements/Label/Label.js b/src/elements/Label/Label.js
index f3b2284be7..ac5e972701 100644
--- a/src/elements/Label/Label.js
+++ b/src/elements/Label/Label.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   createShorthand,
diff --git a/src/elements/Label/LabelDetail.js b/src/elements/Label/LabelDetail.js
index 3f1062fc65..21aeace60b 100644
--- a/src/elements/Label/LabelDetail.js
+++ b/src/elements/Label/LabelDetail.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Label/LabelGroup.js b/src/elements/Label/LabelGroup.js
index 07f2f8989a..25c168ae3e 100644
--- a/src/elements/Label/LabelGroup.js
+++ b/src/elements/Label/LabelGroup.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/List/List.js b/src/elements/List/List.js
index 0b03d560df..0405d320fe 100644
--- a/src/elements/List/List.js
+++ b/src/elements/List/List.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/List/ListContent.js b/src/elements/List/ListContent.js
index 7eb291887d..1c134cf251 100644
--- a/src/elements/List/ListContent.js
+++ b/src/elements/List/ListContent.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/elements/List/ListDescription.js b/src/elements/List/ListDescription.js
index e6327d0cd4..968447eed0 100644
--- a/src/elements/List/ListDescription.js
+++ b/src/elements/List/ListDescription.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/elements/List/ListHeader.js b/src/elements/List/ListHeader.js
index ed70431ba0..ea7e30b48e 100644
--- a/src/elements/List/ListHeader.js
+++ b/src/elements/List/ListHeader.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/elements/List/ListIcon.js b/src/elements/List/ListIcon.js
index 0c084cfd64..b18d07e204 100644
--- a/src/elements/List/ListIcon.js
+++ b/src/elements/List/ListIcon.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/elements/List/ListItem.js b/src/elements/List/ListItem.js
index a1b9b78277..1572f9c991 100644
--- a/src/elements/List/ListItem.js
+++ b/src/elements/List/ListItem.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Component, isValidElement, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component, isValidElement } from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/elements/List/ListList.js b/src/elements/List/ListList.js
index 8ba1641634..5af88cb092 100644
--- a/src/elements/List/ListList.js
+++ b/src/elements/List/ListList.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Loader/Loader.js b/src/elements/Loader/Loader.js
index 3e96a1ee22..d5689d2598 100644
--- a/src/elements/Loader/Loader.js
+++ b/src/elements/Loader/Loader.js
@@ -1,6 +1,7 @@
-import _ from 'lodash'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import _ from 'lodash'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Rail/Rail.js b/src/elements/Rail/Rail.js
index ae1ce3de4d..c0af2f6714 100644
--- a/src/elements/Rail/Rail.js
+++ b/src/elements/Rail/Rail.js
@@ -1,6 +1,7 @@
-import _ from 'lodash'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import _ from 'lodash'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Reveal/Reveal.js b/src/elements/Reveal/Reveal.js
index a160195efc..79dc9bbcb0 100644
--- a/src/elements/Reveal/Reveal.js
+++ b/src/elements/Reveal/Reveal.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Reveal/RevealContent.js b/src/elements/Reveal/RevealContent.js
index 14ee32bc53..8c11b93cae 100644
--- a/src/elements/Reveal/RevealContent.js
+++ b/src/elements/Reveal/RevealContent.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Segment/Segment.js b/src/elements/Segment/Segment.js
index 069054a962..9061405661 100644
--- a/src/elements/Segment/Segment.js
+++ b/src/elements/Segment/Segment.js
@@ -1,6 +1,7 @@
-import _ from 'lodash'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import _ from 'lodash'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Segment/SegmentGroup.js b/src/elements/Segment/SegmentGroup.js
index c626e8ae54..844c5ff768 100644
--- a/src/elements/Segment/SegmentGroup.js
+++ b/src/elements/Segment/SegmentGroup.js
@@ -1,6 +1,7 @@
-import _ from 'lodash'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import _ from 'lodash'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Step/Step.js b/src/elements/Step/Step.js
index 6c8bb5a178..17dc1f79f3 100644
--- a/src/elements/Step/Step.js
+++ b/src/elements/Step/Step.js
@@ -1,6 +1,7 @@
-import _ from 'lodash'
 import cx from 'classnames'
-import React, { Component, PropTypes } from 'react'
+import _ from 'lodash'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Step/StepContent.js b/src/elements/Step/StepContent.js
index 4c5ae5a6fa..b521b5fd99 100644
--- a/src/elements/Step/StepContent.js
+++ b/src/elements/Step/StepContent.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthand,
diff --git a/src/elements/Step/StepDescription.js b/src/elements/Step/StepDescription.js
index 3a2a0de323..af48c30044 100644
--- a/src/elements/Step/StepDescription.js
+++ b/src/elements/Step/StepDescription.js
@@ -1,6 +1,7 @@
-import _ from 'lodash'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import _ from 'lodash'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Step/StepGroup.js b/src/elements/Step/StepGroup.js
index dc97408fdd..cdf1ea7301 100644
--- a/src/elements/Step/StepGroup.js
+++ b/src/elements/Step/StepGroup.js
@@ -1,6 +1,7 @@
-import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import cx from 'classnames'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/elements/Step/StepTitle.js b/src/elements/Step/StepTitle.js
index e50b27e6a6..bfb5061ed7 100644
--- a/src/elements/Step/StepTitle.js
+++ b/src/elements/Step/StepTitle.js
@@ -1,6 +1,7 @@
-import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import cx from 'classnames'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/lib/customPropTypes.js b/src/lib/customPropTypes.js
index ccff3a17a9..587ac7723c 100644
--- a/src/lib/customPropTypes.js
+++ b/src/lib/customPropTypes.js
@@ -1,5 +1,5 @@
-import { PropTypes } from 'react'
 import _ from 'lodash/fp'
+import PropTypes from 'prop-types'
 import leven from './leven'
 
 const typeOf = (...args) => Object.prototype.toString.call(...args)
diff --git a/src/modules/Accordion/Accordion.js b/src/modules/Accordion/Accordion.js
index 6b6f7d0416..a55cdc5d1c 100644
--- a/src/modules/Accordion/Accordion.js
+++ b/src/modules/Accordion/Accordion.js
@@ -1,6 +1,7 @@
-import _ from 'lodash'
 import cx from 'classnames'
-import React, { Children, cloneElement, PropTypes } from 'react'
+import _ from 'lodash'
+import PropTypes from 'prop-types'
+import React, { Children, cloneElement } from 'react'
 
 import {
   AutoControlledComponent as Component,
diff --git a/src/modules/Accordion/AccordionContent.js b/src/modules/Accordion/AccordionContent.js
index 1865cc5692..b8fea06a9e 100644
--- a/src/modules/Accordion/AccordionContent.js
+++ b/src/modules/Accordion/AccordionContent.js
@@ -1,6 +1,7 @@
-import _ from 'lodash'
-import React, { PropTypes } from 'react'
 import cx from 'classnames'
+import _ from 'lodash'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/modules/Accordion/AccordionTitle.js b/src/modules/Accordion/AccordionTitle.js
index 823f8be064..98834908f0 100644
--- a/src/modules/Accordion/AccordionTitle.js
+++ b/src/modules/Accordion/AccordionTitle.js
@@ -1,6 +1,7 @@
-import _ from 'lodash'
 import cx from 'classnames'
-import React, { Component, PropTypes } from 'react'
+import _ from 'lodash'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   customPropTypes,
diff --git a/src/modules/Checkbox/Checkbox.js b/src/modules/Checkbox/Checkbox.js
index c12708d2b4..ab99e4e51a 100644
--- a/src/modules/Checkbox/Checkbox.js
+++ b/src/modules/Checkbox/Checkbox.js
@@ -1,6 +1,7 @@
-import _ from 'lodash/fp'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import _ from 'lodash/fp'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   AutoControlledComponent as Component,
diff --git a/src/modules/Dimmer/Dimmer.js b/src/modules/Dimmer/Dimmer.js
index 30b681b8a9..f7881f9448 100644
--- a/src/modules/Dimmer/Dimmer.js
+++ b/src/modules/Dimmer/Dimmer.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/modules/Dimmer/DimmerDimmable.js b/src/modules/Dimmer/DimmerDimmable.js
index 40bec9ec07..1f07eb695d 100644
--- a/src/modules/Dimmer/DimmerDimmable.js
+++ b/src/modules/Dimmer/DimmerDimmable.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/modules/Dropdown/Dropdown.js b/src/modules/Dropdown/Dropdown.js
index 34d4723beb..db41497810 100644
--- a/src/modules/Dropdown/Dropdown.js
+++ b/src/modules/Dropdown/Dropdown.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Children, cloneElement, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Children, cloneElement } from 'react'
 
 import {
   AutoControlledComponent as Component,
diff --git a/src/modules/Dropdown/DropdownDivider.js b/src/modules/Dropdown/DropdownDivider.js
index 2bb2afedf5..b8ddf2a2eb 100644
--- a/src/modules/Dropdown/DropdownDivider.js
+++ b/src/modules/Dropdown/DropdownDivider.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/modules/Dropdown/DropdownHeader.js b/src/modules/Dropdown/DropdownHeader.js
index 1af3548368..6095114fc2 100644
--- a/src/modules/Dropdown/DropdownHeader.js
+++ b/src/modules/Dropdown/DropdownHeader.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/modules/Dropdown/DropdownItem.js b/src/modules/Dropdown/DropdownItem.js
index 0fa3b958e9..e6027ea341 100644
--- a/src/modules/Dropdown/DropdownItem.js
+++ b/src/modules/Dropdown/DropdownItem.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   childrenUtils,
diff --git a/src/modules/Dropdown/DropdownMenu.js b/src/modules/Dropdown/DropdownMenu.js
index 33cbcc2e96..77e19c3a54 100644
--- a/src/modules/Dropdown/DropdownMenu.js
+++ b/src/modules/Dropdown/DropdownMenu.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/modules/Embed/Embed.js b/src/modules/Embed/Embed.js
index 5c06457f25..67bdb8e530 100644
--- a/src/modules/Embed/Embed.js
+++ b/src/modules/Embed/Embed.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   AutoControlledComponent as Component,
diff --git a/src/modules/Modal/Modal.js b/src/modules/Modal/Modal.js
index d6a7563792..f3c53212c4 100644
--- a/src/modules/Modal/Modal.js
+++ b/src/modules/Modal/Modal.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   AutoControlledComponent as Component,
diff --git a/src/modules/Modal/ModalActions.js b/src/modules/Modal/ModalActions.js
index f561ea29f1..f412f0d23b 100644
--- a/src/modules/Modal/ModalActions.js
+++ b/src/modules/Modal/ModalActions.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/modules/Modal/ModalContent.js b/src/modules/Modal/ModalContent.js
index 5b0a4e576b..67ed32fe05 100644
--- a/src/modules/Modal/ModalContent.js
+++ b/src/modules/Modal/ModalContent.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/modules/Modal/ModalDescription.js b/src/modules/Modal/ModalDescription.js
index 54e5f2975b..5a54d12010 100644
--- a/src/modules/Modal/ModalDescription.js
+++ b/src/modules/Modal/ModalDescription.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/modules/Modal/ModalHeader.js b/src/modules/Modal/ModalHeader.js
index 9650af625a..c9be2d9f70 100644
--- a/src/modules/Modal/ModalHeader.js
+++ b/src/modules/Modal/ModalHeader.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/modules/Popup/Popup.js b/src/modules/Popup/Popup.js
index 4a718c2f29..888cb7ac47 100644
--- a/src/modules/Popup/Popup.js
+++ b/src/modules/Popup/Popup.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   customPropTypes,
diff --git a/src/modules/Popup/PopupContent.js b/src/modules/Popup/PopupContent.js
index a3bc76934a..2d5c152ba1 100644
--- a/src/modules/Popup/PopupContent.js
+++ b/src/modules/Popup/PopupContent.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/modules/Popup/PopupHeader.js b/src/modules/Popup/PopupHeader.js
index 5426a07155..60cc51e8f6 100644
--- a/src/modules/Popup/PopupHeader.js
+++ b/src/modules/Popup/PopupHeader.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/modules/Progress/Progress.js b/src/modules/Progress/Progress.js
index 63ac08047f..f406427767 100644
--- a/src/modules/Progress/Progress.js
+++ b/src/modules/Progress/Progress.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   createHTMLDivision,
diff --git a/src/modules/Rating/Rating.js b/src/modules/Rating/Rating.js
index 9c5389a349..1af432f87b 100644
--- a/src/modules/Rating/Rating.js
+++ b/src/modules/Rating/Rating.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   AutoControlledComponent as Component,
diff --git a/src/modules/Rating/RatingIcon.js b/src/modules/Rating/RatingIcon.js
index 6896b5bdb3..fdc844e6ea 100644
--- a/src/modules/Rating/RatingIcon.js
+++ b/src/modules/Rating/RatingIcon.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   customPropTypes,
diff --git a/src/modules/Search/Search.js b/src/modules/Search/Search.js
index b8065b41f5..668b5b163e 100644
--- a/src/modules/Search/Search.js
+++ b/src/modules/Search/Search.js
@@ -1,6 +1,7 @@
-import _ from 'lodash'
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import _ from 'lodash'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   AutoControlledComponent as Component,
diff --git a/src/modules/Search/SearchCategory.js b/src/modules/Search/SearchCategory.js
index 8ee8f446f0..980afc08f5 100644
--- a/src/modules/Search/SearchCategory.js
+++ b/src/modules/Search/SearchCategory.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/modules/Search/SearchResult.js b/src/modules/Search/SearchResult.js
index 58b96fa65a..022b97f81c 100644
--- a/src/modules/Search/SearchResult.js
+++ b/src/modules/Search/SearchResult.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { Component, PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   createHTMLImage,
diff --git a/src/modules/Search/SearchResults.js b/src/modules/Search/SearchResults.js
index f2b90c4c05..2d6c9a3448 100644
--- a/src/modules/Search/SearchResults.js
+++ b/src/modules/Search/SearchResults.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/modules/Sidebar/Sidebar.js b/src/modules/Sidebar/Sidebar.js
index 9ed55a3e94..35510bc711 100644
--- a/src/modules/Sidebar/Sidebar.js
+++ b/src/modules/Sidebar/Sidebar.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   AutoControlledComponent as Component,
diff --git a/src/modules/Sidebar/SidebarPushable.js b/src/modules/Sidebar/SidebarPushable.js
index 92497baf18..fc7a14236c 100644
--- a/src/modules/Sidebar/SidebarPushable.js
+++ b/src/modules/Sidebar/SidebarPushable.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/modules/Sidebar/SidebarPusher.js b/src/modules/Sidebar/SidebarPusher.js
index a811b9985e..d15cc96c00 100644
--- a/src/modules/Sidebar/SidebarPusher.js
+++ b/src/modules/Sidebar/SidebarPusher.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Advertisement/Advertisement.js b/src/views/Advertisement/Advertisement.js
index d75458f906..9ce7a554cb 100644
--- a/src/views/Advertisement/Advertisement.js
+++ b/src/views/Advertisement/Advertisement.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Card/Card.js b/src/views/Card/Card.js
index f3d4a225df..d9b3e77187 100644
--- a/src/views/Card/Card.js
+++ b/src/views/Card/Card.js
@@ -1,6 +1,7 @@
-import _ from 'lodash'
 import cx from 'classnames'
-import React, { Component, PropTypes } from 'react'
+import _ from 'lodash'
+import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Card/CardContent.js b/src/views/Card/CardContent.js
index 743532ccdf..f4c122e882 100644
--- a/src/views/Card/CardContent.js
+++ b/src/views/Card/CardContent.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthand,
diff --git a/src/views/Card/CardDescription.js b/src/views/Card/CardDescription.js
index 0a0a95780f..9b4e142046 100644
--- a/src/views/Card/CardDescription.js
+++ b/src/views/Card/CardDescription.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Card/CardGroup.js b/src/views/Card/CardGroup.js
index d79b729ab1..52050a5d9c 100644
--- a/src/views/Card/CardGroup.js
+++ b/src/views/Card/CardGroup.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Card/CardHeader.js b/src/views/Card/CardHeader.js
index 278861de85..275beb4632 100644
--- a/src/views/Card/CardHeader.js
+++ b/src/views/Card/CardHeader.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Card/CardMeta.js b/src/views/Card/CardMeta.js
index 385a275304..78c29f6421 100644
--- a/src/views/Card/CardMeta.js
+++ b/src/views/Card/CardMeta.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Comment/Comment.js b/src/views/Comment/Comment.js
index 4857f675b1..cfbe6e87c2 100644
--- a/src/views/Comment/Comment.js
+++ b/src/views/Comment/Comment.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Comment/CommentAction.js b/src/views/Comment/CommentAction.js
index fafde69c65..4b08b3dfae 100644
--- a/src/views/Comment/CommentAction.js
+++ b/src/views/Comment/CommentAction.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Comment/CommentActions.js b/src/views/Comment/CommentActions.js
index 239063e2b7..e7addaa99d 100644
--- a/src/views/Comment/CommentActions.js
+++ b/src/views/Comment/CommentActions.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Comment/CommentAuthor.js b/src/views/Comment/CommentAuthor.js
index e975872de0..72b10c1798 100644
--- a/src/views/Comment/CommentAuthor.js
+++ b/src/views/Comment/CommentAuthor.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Comment/CommentAvatar.js b/src/views/Comment/CommentAvatar.js
index 519c41d6d6..f929f7d9b3 100644
--- a/src/views/Comment/CommentAvatar.js
+++ b/src/views/Comment/CommentAvatar.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createHTMLImage,
diff --git a/src/views/Comment/CommentContent.js b/src/views/Comment/CommentContent.js
index 27fcd3816c..48ad17c2c3 100644
--- a/src/views/Comment/CommentContent.js
+++ b/src/views/Comment/CommentContent.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Comment/CommentGroup.js b/src/views/Comment/CommentGroup.js
index 7b797db219..34a17c2b85 100644
--- a/src/views/Comment/CommentGroup.js
+++ b/src/views/Comment/CommentGroup.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Comment/CommentMetadata.js b/src/views/Comment/CommentMetadata.js
index 23368801fa..56c0d66803 100644
--- a/src/views/Comment/CommentMetadata.js
+++ b/src/views/Comment/CommentMetadata.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Comment/CommentText.js b/src/views/Comment/CommentText.js
index 23592fc1db..7b6cdc3086 100644
--- a/src/views/Comment/CommentText.js
+++ b/src/views/Comment/CommentText.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Feed/Feed.js b/src/views/Feed/Feed.js
index 1d1f8c46e4..a5c0237fa5 100644
--- a/src/views/Feed/Feed.js
+++ b/src/views/Feed/Feed.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Feed/FeedContent.js b/src/views/Feed/FeedContent.js
index b243efd1da..ccaa62c95e 100644
--- a/src/views/Feed/FeedContent.js
+++ b/src/views/Feed/FeedContent.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthand,
diff --git a/src/views/Feed/FeedDate.js b/src/views/Feed/FeedDate.js
index 8085f066df..fbbf6ba1e9 100644
--- a/src/views/Feed/FeedDate.js
+++ b/src/views/Feed/FeedDate.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Feed/FeedEvent.js b/src/views/Feed/FeedEvent.js
index dc4e9fa90e..91b570d766 100644
--- a/src/views/Feed/FeedEvent.js
+++ b/src/views/Feed/FeedEvent.js
@@ -1,5 +1,6 @@
 import cx from 'classnames'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthand,
diff --git a/src/views/Feed/FeedExtra.js b/src/views/Feed/FeedExtra.js
index 2be6bba49b..6f11b0113b 100644
--- a/src/views/Feed/FeedExtra.js
+++ b/src/views/Feed/FeedExtra.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createHTMLImage,
diff --git a/src/views/Feed/FeedLabel.js b/src/views/Feed/FeedLabel.js
index 0cc3fcc3f3..09bc91bae7 100644
--- a/src/views/Feed/FeedLabel.js
+++ b/src/views/Feed/FeedLabel.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createHTMLImage,
diff --git a/src/views/Feed/FeedLike.js b/src/views/Feed/FeedLike.js
index d115d37a70..fc4cd5e577 100644
--- a/src/views/Feed/FeedLike.js
+++ b/src/views/Feed/FeedLike.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Feed/FeedMeta.js b/src/views/Feed/FeedMeta.js
index e22d5edc6c..ccbaf81392 100644
--- a/src/views/Feed/FeedMeta.js
+++ b/src/views/Feed/FeedMeta.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthand,
diff --git a/src/views/Feed/FeedSummary.js b/src/views/Feed/FeedSummary.js
index f663257f61..97734b09a6 100644
--- a/src/views/Feed/FeedSummary.js
+++ b/src/views/Feed/FeedSummary.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthand,
diff --git a/src/views/Feed/FeedUser.js b/src/views/Feed/FeedUser.js
index b43a4f5409..88ce10bea7 100644
--- a/src/views/Feed/FeedUser.js
+++ b/src/views/Feed/FeedUser.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Item/Item.js b/src/views/Item/Item.js
index f5aec11f39..f74f713eb5 100644
--- a/src/views/Item/Item.js
+++ b/src/views/Item/Item.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Item/ItemContent.js b/src/views/Item/ItemContent.js
index 56da1315dd..6cea1651d8 100644
--- a/src/views/Item/ItemContent.js
+++ b/src/views/Item/ItemContent.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Item/ItemDescription.js b/src/views/Item/ItemDescription.js
index 08faf37bbc..b783372aa0 100644
--- a/src/views/Item/ItemDescription.js
+++ b/src/views/Item/ItemDescription.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/views/Item/ItemExtra.js b/src/views/Item/ItemExtra.js
index 2317340598..baba2b319c 100644
--- a/src/views/Item/ItemExtra.js
+++ b/src/views/Item/ItemExtra.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/views/Item/ItemGroup.js b/src/views/Item/ItemGroup.js
index aca5dbbc5a..7aa2eabcd1 100644
--- a/src/views/Item/ItemGroup.js
+++ b/src/views/Item/ItemGroup.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Item/ItemHeader.js b/src/views/Item/ItemHeader.js
index 069782ce53..93de2f1b5e 100644
--- a/src/views/Item/ItemHeader.js
+++ b/src/views/Item/ItemHeader.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/views/Item/ItemMeta.js b/src/views/Item/ItemMeta.js
index 59189cc5cf..2b2fbff297 100644
--- a/src/views/Item/ItemMeta.js
+++ b/src/views/Item/ItemMeta.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   createShorthandFactory,
diff --git a/src/views/Statistic/Statistic.js b/src/views/Statistic/Statistic.js
index 0e9be9c7e3..b54fcb150f 100644
--- a/src/views/Statistic/Statistic.js
+++ b/src/views/Statistic/Statistic.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Statistic/StatisticGroup.js b/src/views/Statistic/StatisticGroup.js
index 80286c89fa..b824d3335b 100644
--- a/src/views/Statistic/StatisticGroup.js
+++ b/src/views/Statistic/StatisticGroup.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Statistic/StatisticLabel.js b/src/views/Statistic/StatisticLabel.js
index 1744921869..49251a3ab2 100644
--- a/src/views/Statistic/StatisticLabel.js
+++ b/src/views/Statistic/StatisticLabel.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/src/views/Statistic/StatisticValue.js b/src/views/Statistic/StatisticValue.js
index 967d99821f..4b5d09c635 100644
--- a/src/views/Statistic/StatisticValue.js
+++ b/src/views/Statistic/StatisticValue.js
@@ -1,6 +1,7 @@
 import cx from 'classnames'
 import _ from 'lodash'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 
 import {
   customPropTypes,
diff --git a/test/specs/addons/Portal/Portal-test.js b/test/specs/addons/Portal/Portal-test.js
index 910c9fe417..7d0f3d342b 100644
--- a/test/specs/addons/Portal/Portal-test.js
+++ b/test/specs/addons/Portal/Portal-test.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types'
 import React from 'react'
 import { unmountComponentAtNode } from 'react-dom'
 
@@ -25,7 +26,7 @@ describe('Portal', () => {
   })
 
   it('propTypes.children should be required', () => {
-    Portal.propTypes.children.should.equal(React.PropTypes.node.isRequired)
+    Portal.propTypes.children.should.equal(PropTypes.node.isRequired)
   })
 
   it('this.rootNode should be undefined if portal is not open', () => {
diff --git a/webpack.config.js b/webpack.config.js
index eaf97dc397..c7a434e388 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -88,6 +88,7 @@ webpackConfig.plugins = [...webpackConfig.plugins,
       faker: require('faker/package.json').version,
       jsBeautify: require('js-beautify/package.json').version,
       lodash: require('lodash/package.json').version,
+      propTypes: require('prop-types/package.json').version,
       react: require('react/package.json').version,
       reactDOM: require('react-dom/package.json').version,
       sui: require('semantic-ui-css/package.json').version,
@@ -137,6 +138,7 @@ if (!__TEST__) {
     'anchor-js': 'AnchorJS',
     'babel-standalone': 'Babel',
     faker: 'faker',
+    'prop-types': 'PropTypes',
     react: 'React',
     'react-dom': 'ReactDOM',
     'react-dom/server': 'ReactDOMServer',