diff --git a/package.json b/package.json
index e0a2241..ea2742a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-fine-uploader",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "license": "MIT",
   "description": "React UI components for using Fine Uploader in a React-based project.",
   "author":     {
@@ -22,7 +22,8 @@
   "main": "gallery/index.js",
   "peerDependencies": {
     "react": "0.14.x || 15.x.x",
-    "react-addons-css-transition-group": "0.14.x || 15.x.x"
+    "react-addons-css-transition-group": "0.14.x || 15.x.x",
+    "prop-types": "15.x.x"
   },
   "dependencies": {
     "fine-uploader-wrappers": "1.0.0",
@@ -59,6 +60,7 @@
     "react-addons-css-transition-group": "15.4.2",
     "react-addons-test-utils": "15.4.2",
     "react-dom": "15.4.2",
+    "prop-types": "15.5.8",
     "style-loader": "0.16.0",
     "webpack": "2.3.2",
     "webpack-node-externals": "1.5.4"
diff --git a/src/cancel-button.jsx b/src/cancel-button.jsx
index a9cc6fa..4d9e1ec 100644
--- a/src/cancel-button.jsx
+++ b/src/cancel-button.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class CancelButton extends Component {
     static propTypes = {
diff --git a/src/delete-button.jsx b/src/delete-button.jsx
index a070be6..cdbcb76 100644
--- a/src/delete-button.jsx
+++ b/src/delete-button.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class DeleteButton extends Component {
     static propTypes = {
diff --git a/src/dropzone.jsx b/src/dropzone.jsx
index f75ec03..fd470fa 100644
--- a/src/dropzone.jsx
+++ b/src/dropzone.jsx
@@ -1,5 +1,6 @@
 import qq from 'fine-uploader/lib/dnd'
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class DropzoneElement extends Component {
     static propTypes = {
diff --git a/src/file-input/index.jsx b/src/file-input/index.jsx
index 34a86db..e4a27af 100644
--- a/src/file-input/index.jsx
+++ b/src/file-input/index.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import StyleableElement from './styleable-element'
 
diff --git a/src/filename.jsx b/src/filename.jsx
index 223bb5c..d228261 100644
--- a/src/filename.jsx
+++ b/src/filename.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Filename extends Component {
     static propTypes = {
diff --git a/src/filesize.jsx b/src/filesize.jsx
index d165c7a..5248c22 100644
--- a/src/filesize.jsx
+++ b/src/filesize.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Filesize extends Component {
     static propTypes = {
diff --git a/src/gallery/index.jsx b/src/gallery/index.jsx
index 8218b55..199508f 100644
--- a/src/gallery/index.jsx
+++ b/src/gallery/index.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import ReactCssTransitionGroup from 'react-addons-css-transition-group'
 
 import CancelButton from '../cancel-button'
diff --git a/src/pause-resume-button.jsx b/src/pause-resume-button.jsx
index efde1a2..56db7df 100644
--- a/src/pause-resume-button.jsx
+++ b/src/pause-resume-button.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class PauseResumeButton extends Component {
     static propTypes = {
diff --git a/src/progress-bar.jsx b/src/progress-bar.jsx
index 88de630..c1106ff 100644
--- a/src/progress-bar.jsx
+++ b/src/progress-bar.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class ProgressBar extends Component {
     static propTypes = {
diff --git a/src/retry-button.jsx b/src/retry-button.jsx
index d324081..5884314 100644
--- a/src/retry-button.jsx
+++ b/src/retry-button.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class RetryButton extends Component {
     static propTypes = {
diff --git a/src/status.jsx b/src/status.jsx
index 4130264..4db12ea 100644
--- a/src/status.jsx
+++ b/src/status.jsx
@@ -1,5 +1,6 @@
 import objectAssign from 'object-assign'
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Status extends Component {
     static propTypes = {
diff --git a/src/thumbnail/index.jsx b/src/thumbnail/index.jsx
index 142597d..b5f18a2 100644
--- a/src/thumbnail/index.jsx
+++ b/src/thumbnail/index.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import Placeholder from './placeholder'
 
diff --git a/src/thumbnail/not-available-placeholder.jsx b/src/thumbnail/not-available-placeholder.jsx
index 36e8a9b..1e384bf 100644
--- a/src/thumbnail/not-available-placeholder.jsx
+++ b/src/thumbnail/not-available-placeholder.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class NotAvailablePlaceholder extends Component {
     static propTypes = {
diff --git a/src/thumbnail/placeholder.jsx b/src/thumbnail/placeholder.jsx
index faeec61..24663f4 100644
--- a/src/thumbnail/placeholder.jsx
+++ b/src/thumbnail/placeholder.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
 
 const Placeholder = ({ className, image, size, status }) => {
     const style = {
diff --git a/src/thumbnail/waiting-placeholder.jsx b/src/thumbnail/waiting-placeholder.jsx
index a91bcf4..f75ffd6 100644
--- a/src/thumbnail/waiting-placeholder.jsx
+++ b/src/thumbnail/waiting-placeholder.jsx
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class WaitingPlaceholder extends Component {
     static propTypes = {