diff --git a/example/AudioPlayer.jsx b/example/AudioPlayer.jsx
index 863c29f..9e185cd 100644
--- a/example/AudioPlayer.jsx
+++ b/example/AudioPlayer.jsx
@@ -1,5 +1,6 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
 import ReactDOM, { findDOMNode } from 'react-dom'
+import PropTypes from 'prop-types'
 import { Media, Player, controls, utils } from '../src/react-media-player'
 import PlayPause from './PlayPause'
 import MuteUnmute from './MuteUnmute'
diff --git a/example/CirclePlayer.jsx b/example/CirclePlayer.jsx
index e054f88..9f37b74 100644
--- a/example/CirclePlayer.jsx
+++ b/example/CirclePlayer.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import CircleProgress from './CircleProgress'
 import { Media, Player } from '../src/react-media-player'
 
diff --git a/example/Fullscreen.jsx b/example/Fullscreen.jsx
index b2b1bd8..01d0a27 100644
--- a/example/Fullscreen.jsx
+++ b/example/Fullscreen.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { withMediaProps } from '../src/react-media-player'
 
 class Fullscreen extends Component {
diff --git a/example/MediaPlayer.jsx b/example/MediaPlayer.jsx
index 4b9f99a..ec5b9aa 100644
--- a/example/MediaPlayer.jsx
+++ b/example/MediaPlayer.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Media, Player, controls, utils } from '../src/react-media-player'
 import PlayPause from './PlayPause'
 import MuteUnmute from './MuteUnmute'
diff --git a/example/MuteUnmute.jsx b/example/MuteUnmute.jsx
index 5db6940..5ce3e0f 100644
--- a/example/MuteUnmute.jsx
+++ b/example/MuteUnmute.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { withMediaProps } from '../src/react-media-player'
 import Transition from 'react-motion-ui-pack'
 
diff --git a/example/PlayPause.jsx b/example/PlayPause.jsx
index 5aade4a..ffe627d 100644
--- a/example/PlayPause.jsx
+++ b/example/PlayPause.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { withMediaProps } from '../src/react-media-player'
 import Transition from 'react-motion-ui-pack'
 
diff --git a/example/Repeat.jsx b/example/Repeat.jsx
index 846617b..fcb3a53 100644
--- a/example/Repeat.jsx
+++ b/example/Repeat.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Repeat extends Component {
   render() {
diff --git a/example/VideoPlayer.jsx b/example/VideoPlayer.jsx
index fde3209..667a001 100644
--- a/example/VideoPlayer.jsx
+++ b/example/VideoPlayer.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Media, Player, withMediaProps, withKeyboardControls, controls } from '../src/react-media-player'
 import PlayPause from './PlayPause'
 import MuteUnmute from './MuteUnmute'
diff --git a/example/index.jsx b/example/index.jsx
index 3600395..4996ea9 100644
--- a/example/index.jsx
+++ b/example/index.jsx
@@ -1,5 +1,6 @@
-import React, { Component, PropTypes, createElement } from 'react'
+import React, { Component, createElement } from 'react'
 import ReactDOM from 'react-dom'
+import PropTypes from 'prop-types'
 import MediaPlayer from './MediaPlayer'
 import VideoPlayer from './VideoPlayer'
 import AudioPlayer from './AudioPlayer'
diff --git a/package.json b/package.json
index 84f3d42..1aca596 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,10 @@
   "version": "0.6.2",
   "description": "React media player.",
   "main": "lib/react-media-player.js",
-  "files": ["dist", "lib"],
+  "files": [
+    "dist",
+    "lib"
+  ],
   "scripts": {
     "build:lib": "babel src --out-dir lib",
     "build": "npm run build:lib && NODE_ENV=production webpack --config webpack.prod.config.js",
diff --git a/src/Media.jsx b/src/Media.jsx
index c1ee5bb..063b939 100644
--- a/src/Media.jsx
+++ b/src/Media.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes, Children } from 'react'
+import React, { Component, Children } from 'react'
+import PropTypes from 'prop-types';
 import ReactDOM, { findDOMNode } from 'react-dom'
 import contextTypes from './context-types'
 import requestFullscreen from './utils/request-fullscreen'
diff --git a/src/Player.jsx b/src/Player.jsx
index 869ed46..f64f525 100644
--- a/src/Player.jsx
+++ b/src/Player.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes, createElement } from 'react'
+import React, { Component, createElement } from 'react'
+import PropTypes from 'prop-types'
 import contextTypes from './context-types'
 import getVendor from './utils/get-vendor'
 
diff --git a/src/controls/CurrentTime.jsx b/src/controls/CurrentTime.jsx
index 17ce619..6a41b54 100644
--- a/src/controls/CurrentTime.jsx
+++ b/src/controls/CurrentTime.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 import formatTime from '../utils/format-time'
 
diff --git a/src/controls/Duration.jsx b/src/controls/Duration.jsx
index e610fd7..791aedd 100644
--- a/src/controls/Duration.jsx
+++ b/src/controls/Duration.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 import formatTime from '../utils/format-time'
 
diff --git a/src/controls/Fullscreen.jsx b/src/controls/Fullscreen.jsx
index d52c23e..cdd896b 100644
--- a/src/controls/Fullscreen.jsx
+++ b/src/controls/Fullscreen.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 
 class Fullscreen extends Component {
diff --git a/src/controls/MuteUnmute.jsx b/src/controls/MuteUnmute.jsx
index 557387a..1754537 100644
--- a/src/controls/MuteUnmute.jsx
+++ b/src/controls/MuteUnmute.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 
 class MuteUnmute extends Component {
diff --git a/src/controls/PlayPause.jsx b/src/controls/PlayPause.jsx
index c6c2da4..781d26f 100644
--- a/src/controls/PlayPause.jsx
+++ b/src/controls/PlayPause.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 
 class PlayPause extends Component {
diff --git a/src/controls/Progress.jsx b/src/controls/Progress.jsx
index f6af343..938769e 100644
--- a/src/controls/Progress.jsx
+++ b/src/controls/Progress.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 
 class Progress extends Component {
diff --git a/src/controls/SeekBar.jsx b/src/controls/SeekBar.jsx
index ff22af7..569d516 100644
--- a/src/controls/SeekBar.jsx
+++ b/src/controls/SeekBar.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 
 class SeekBar extends Component {
diff --git a/src/controls/Volume.jsx b/src/controls/Volume.jsx
index d14b1a4..a24730d 100644
--- a/src/controls/Volume.jsx
+++ b/src/controls/Volume.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 
 class Volume extends Component {
diff --git a/src/vendors/HTML5.jsx b/src/vendors/HTML5.jsx
index 627a74b..8d99eee 100644
--- a/src/vendors/HTML5.jsx
+++ b/src/vendors/HTML5.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes, createElement } from 'react'
+import React, { Component, createElement } from 'react'
+import PropTypes from 'prop-types'
 import { findDOMNode } from 'react-dom'
 import vendorPropTypes from './vendor-prop-types'