diff --git a/.storybook/ThemeContainer.js b/.storybook/ThemeContainer.js
index 503dcaf35efc..ecacc64d828e 100644
--- a/.storybook/ThemeContainer.js
+++ b/.storybook/ThemeContainer.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import ThemeSwitcher from './ThemeSwitcher';
 import AppContainer from '../components/AppContainer';
 import './_theme-container.scss';
diff --git a/.storybook/ThemeSwitcher.js b/.storybook/ThemeSwitcher.js
index 8de7e5b4273c..bc45f831fae3 100644
--- a/.storybook/ThemeSwitcher.js
+++ b/.storybook/ThemeSwitcher.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import './_theme-switcher.scss';
 import Icon from '../components/Icon';
 
diff --git a/.storybook/components/CardStory.js b/.storybook/components/CardStory.js
index d4402a1482fe..72f3548b6cb6 100644
--- a/.storybook/components/CardStory.js
+++ b/.storybook/components/CardStory.js
@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { storiesOf } from '@kadira/storybook';
 import Card from '../../components/Card';
 import OverflowMenu from '../../components/OverflowMenu';
@@ -47,8 +48,8 @@ const virtualServerCardLinks = [
 
 class ControlledCard extends Component {
   static propTypes = {
-    status: React.PropTypes.number,
-    stopApp: React.PropTypes.func,
+    status: PropTypes.number,
+    stopApp: PropTypes.func,
   }
 
   static defaultProps = {
diff --git a/components/Pagination.js b/components/Pagination.js
index 8856c8a0b4b3..2205607f4a13 100644
--- a/components/Pagination.js
+++ b/components/Pagination.js
@@ -25,7 +25,7 @@ class Pagination extends Component {
     pageRangeText: PropTypes.func,
     pageSizes: PropTypes.arrayOf(PropTypes.number).isRequired,
     totalItems: PropTypes.number.isRequired,
-    disabled: React.PropTypes.bool,
+    disabled: PropTypes.bool,
     page: PropTypes.number,
     pageSize: PropTypes.number,
   }
diff --git a/components/Tag.js b/components/Tag.js
index 914217ca9cfc..f641e89b458e 100644
--- a/components/Tag.js
+++ b/components/Tag.js
@@ -19,7 +19,7 @@ const TYPES = {
 };
 
 const propTypes = {
-  children: React.PropTypes.node,
+  children: PropTypes.node,
   className: PropTypes.string,
   type: PropTypes.oneOf(Object.keys(TYPES)).isRequired,
 };
diff --git a/internal/ClickListener.js b/internal/ClickListener.js
index 81a646531f54..7d960d43cc7c 100644
--- a/internal/ClickListener.js
+++ b/internal/ClickListener.js
@@ -1,6 +1,7 @@
 /* global document */
 
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 class ClickListener extends React.Component {
   static propTypes = {