diff --git a/react-datepicker/index.d.ts b/react-datepicker/index.d.ts
index 3ceedaa99a..ae33a5c24f 100644
--- a/react-datepicker/index.d.ts
+++ b/react-datepicker/index.d.ts
@@ -1,12 +1,13 @@
-// Type definitions for react-datepicker v0.28.1
+// Type definitions for react-datepicker v0.40.0
 // Project: https://github.com/Hacker0x01/react-datepicker
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>, Andrey Balokha <https://github.com/andrewBalekha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-/// <reference types="react"/>
-
 declare module "react-datepicker" {
+    import * as React from "react";
+    import * as moment from "moment";
+
     interface ReactDatePickerProps {
         autoComplete?: string;
         autoFocus?: boolean;
@@ -15,7 +16,7 @@ declare module "react-datepicker" {
         dateFormat?: string;
         dateFormatCalendar?: string;
         disabled?: boolean;
-        endDate?: {};
+        endDate?: moment.Moment;
         excludeDates?: any[];
         filterDate?(): any;
         fixedHeight?: boolean;
@@ -23,12 +24,12 @@ declare module "react-datepicker" {
         includeDates?: any[];
         isClearable?: boolean;
         locale?: string;
-        maxDate?: {};
-        minDate?: {};
+        maxDate?: moment.Moment;
+        minDate?: moment.Moment;
         name?: string;
-        onBlur?(e: any): void;
-        onChange(date?: any, e?: any): void;
-        onFocus?(e: any): void;
+        onBlur?(event: React.FocusEvent<HTMLInputElement>): void;
+        onChange(date: moment.Moment | null, event: React.SyntheticEvent<any> | undefined): any;
+        onFocus?(event: React.FocusEvent<HTMLInputElement>): void;
         peekNextMonth?: boolean;
         placeholderText?: string;
         popoverAttachment?: string;
@@ -38,13 +39,13 @@ declare module "react-datepicker" {
         renderCalendarTo?: any;
         required?: boolean;
         scrollableYearDropdown?: boolean;
-        selected?: {};
+        selected?: moment.Moment | null;
         selectsEnd?: boolean;
         selectsStart?: boolean;
         showMonthDropdown?: boolean;
         showYearDropdown?: boolean;
         showWeekNumbers?: boolean;
-        startDate?: {};
+        startDate?: moment.Moment;
         tabIndex?: number;
         tetherConstraints?: any[];
         title?: string;
diff --git a/react-datepicker/react-datepicker-tests.tsx b/react-datepicker/react-datepicker-tests.tsx
index 53cd4723b5..df1b02dacf 100644
--- a/react-datepicker/react-datepicker-tests.tsx
+++ b/react-datepicker/react-datepicker-tests.tsx
@@ -2,8 +2,8 @@ import * as React from "react";
 import * as moment from 'moment';
 import * as DatePicker from 'react-datepicker';
 
-class ReactDatePicker extends React.Component<{}, {startDate:any,displayName:string}> {
-     constructor(props:any) {
+class ReactDatePicker extends React.Component<{}, { startDate: moment.Moment; displayName:string; }> {
+     constructor(props: {}) {
         super();
         this.state = {
           startDate: moment(),
@@ -12,7 +12,7 @@ class ReactDatePicker extends React.Component<{}, {startDate:any,displayName:str
         this.handleChange = this.handleChange.bind(this);
      }
 
-     handleChange = function(date?:any) {
+     handleChange = function(date?: moment.Moment | null) {
         this.setState({
           startDate: date
         });