diff --git a/package.json b/package.json
index d482a27..71c8d04 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
   "dependencies": {
     "classnames": "^2.2.5",
     "moment-jalali": "^0.3.9",
+    "prop-types": "^15.5.10",
     "rc-trigger": "^1.7.2",
     "react-onclickoutside": "^5.3.3",
     "react-tether": "^0.5.2"
diff --git a/src/components/Calendar.js b/src/components/Calendar.js
index 27dc23b..a042976 100644
--- a/src/components/Calendar.js
+++ b/src/components/Calendar.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import DaysViewHeading from './DaysViewHeading';
 import DaysOfWeek from './DaysOfWeek';
 import MonthSelector from './MonthSelector';
diff --git a/src/components/DatePicker.js b/src/components/DatePicker.js
index 2520c63..1d935c8 100644
--- a/src/components/DatePicker.js
+++ b/src/components/DatePicker.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import moment from 'moment-jalali';
 import TetherComponent from 'react-tether';
 import Calendar from './Calendar';
diff --git a/src/components/Day.js b/src/components/Day.js
index 44a5843..1b458e0 100644
--- a/src/components/Day.js
+++ b/src/components/Day.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { persianNumber } from '../utils/persian';
 
diff --git a/src/components/DaysOfWeek.js b/src/components/DaysOfWeek.js
index ce1ddb1..520c2c8 100644
--- a/src/components/DaysOfWeek.js
+++ b/src/components/DaysOfWeek.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 // Day of week names for use in date-picker heading
 const dayOfWeekNames = ['ش', 'ی', 'د', 'س', 'چ', 'پ', 'ج'];
diff --git a/src/components/DaysViewHeading.js b/src/components/DaysViewHeading.js
index 8e21af9..0d18211 100755
--- a/src/components/DaysViewHeading.js
+++ b/src/components/DaysViewHeading.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { persianNumber } from '../utils/persian';
 import { leftArrow, rightArrow } from '../utils/assets';
 
diff --git a/src/components/MonthSelector.js b/src/components/MonthSelector.js
index 9416fff..0e6a679 100644
--- a/src/components/MonthSelector.js
+++ b/src/components/MonthSelector.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import moment from 'moment-jalali';
 import classnames from 'classnames';
 import MonthsViewHeading from './MonthsViewHeading';
diff --git a/src/components/MonthsViewHeading.js b/src/components/MonthsViewHeading.js
index 9bb54c8..74c7e8f 100644
--- a/src/components/MonthsViewHeading.js
+++ b/src/components/MonthsViewHeading.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { persianNumber } from '../utils/persian';
 import { leftArrow, rightArrow } from '../utils/assets';