diff --git a/components/date-picker/RangePicker.tsx b/components/date-picker/RangePicker.tsx
index 2270ab49d2..5755828661 100644
--- a/components/date-picker/RangePicker.tsx
+++ b/components/date-picker/RangePicker.tsx
@@ -78,7 +78,9 @@ export default class RangePicker extends React.Component {
       onOk: this.handleChange,
     };
     if (props.timePicker) {
-      pickerChangeHandler = {};
+      pickerChangeHandler.onChange = (value) => {
+        this.handleChange(value);
+      };
     } else {
       calendarHandler = {};
     }
@@ -91,6 +93,7 @@ export default class RangePicker extends React.Component {
     const calendar = (
       <RangeCalendar
         prefixCls="ant-calendar"
+        formatter={props.getFormatter()}
         className={calendarClassName}
         timePicker={props.timePicker}
         disabledDate={disabledDate}
diff --git a/components/date-picker/demo/start-end.md b/components/date-picker/demo/start-end.md
index bb608607df..06d40251c8 100644
--- a/components/date-picker/demo/start-end.md
+++ b/components/date-picker/demo/start-end.md
@@ -29,7 +29,7 @@ const DateRange = React.createClass({
     if (!startValue || !this.state.endValue) {
       return false;
     }
-    return startValue.getTime() >= this.state.endValue.getTime();
+    return startValue.getTime() > this.state.endValue.getTime();
   },
   disabledEndDate(endValue) {
     if (!endValue || !this.state.startValue) {
@@ -38,7 +38,6 @@ const DateRange = React.createClass({
     return endValue.getTime() <= this.state.startValue.getTime();
   },
   onChange(field, value) {
-    console.log(field, 'change', value);
     this.setState({
       [field]: value,
     });
diff --git a/components/date-picker/index.tsx b/components/date-picker/index.tsx
index 7262019031..9c33a6efb4 100644
--- a/components/date-picker/index.tsx
+++ b/components/date-picker/index.tsx
@@ -9,7 +9,7 @@ const DatePicker = wrapPicker(createPicker(RcCalendar));
 const MonthPicker = wrapPicker(createPicker(MonthCalendar), 'yyyy-MM');
 
 DatePicker.Calendar = Calendar;
-DatePicker.RangePicker = wrapPicker(RangePicker, 'yyyy-MM-dd');
+DatePicker.RangePicker = wrapPicker(RangePicker);
 DatePicker.MonthPicker = MonthPicker;
 
 export default DatePicker;
diff --git a/components/date-picker/style/Calendar.less b/components/date-picker/style/Calendar.less
index 27fec19723..6f34dc7795 100644
--- a/components/date-picker/style/Calendar.less
+++ b/components/date-picker/style/Calendar.less
@@ -106,7 +106,7 @@
     .calendarPanelHeader(@calendar-prefix-cls);
   }
 
-  &-calendar-body {
+  &-body {
     padding: 4px 8px;
   }
 
@@ -163,6 +163,10 @@
     text-align: center;
     transition: background 0.3s ease;
 
+    &-panel {
+      position: relative;
+    }
+
     &:hover {
       background: tint(@primary-color, 90%);
       cursor: pointer;
@@ -286,6 +290,9 @@
     &-disabled {
       .button-color(@btn-disable-color; @btn-disable-bg; @btn-disable-border);
       cursor: not-allowed;
+      &:hover {
+        .button-color(@btn-disable-color; @btn-disable-bg; @btn-disable-border);
+      }
     }
   }
 }
diff --git a/components/date-picker/style/RangePicker.less b/components/date-picker/style/RangePicker.less
index 047c77ed0d..6c4b5d2241 100644
--- a/components/date-picker/style/RangePicker.less
+++ b/components/date-picker/style/RangePicker.less
@@ -26,16 +26,40 @@
   width: 470px;
   overflow: hidden;
 
+  .@{calendar-prefix-cls}-date-panel {
+    &::after {
+      content: ".";
+      display: block;
+      height: 0;
+      clear: both;
+      visibility: hidden;
+    }
+  }
   &-part {
     width: 50%;
+    position: relative;
   }
 
   &-left {
     float: left;
+    .@{calendar-prefix-cls} {
+      &-time-picker-inner {
+        border-right: 1px solid #e9e9e9;
+      }
+    }
   }
 
   &-right {
     float: right;
+    .@{calendar-prefix-cls} {
+      &-time-picker-inner {
+        margin-left: 21px;
+        border-left: 1px solid #e9e9e9;
+      }
+      &-time-picker-panel {
+        // padding-left: 22px;
+      }
+    }
   }
 
   &-middle {
@@ -74,7 +98,12 @@
     .input;
     border-radius: @border-radius-sm;
     height: @input-height-sm;
-    width: 96px;
+    border: 0;
+    box-shadow: none;
+
+    &:focus {
+      box-shadow: none;
+    }
   }
   .@{timepicker-prefix-cls}-icon {
     display: none;
@@ -132,14 +161,68 @@
   &-bottom {
     text-align: right;
   }
-  .@{calendar-prefix-cls}-ok-btn {
-    position: static;
-    height: 22px;
-    margin: 8px;
+
+  .@{calendar-prefix-cls} {
+    &-header {
+      border-bottom: 0;
+    }
+    &-body {
+      border-top: 1px solid #e9e9e9;
+    }
   }
-  .@{calendar-prefix-cls}-today-btn {
-    margin: 8px 12px;
-    height: 22px;
-    line-height: 22px;
+
+  &.@{calendar-prefix-cls}-time {
+
+    .@{timepicker-prefix-cls} {
+      height: 207px;
+      top: 68px;
+      z-index: 2; // in order to cover .ant-calendar-range .ant-calendar-in-range-cell > div (z-index: 1)
+      &-panel {
+        height: 241px;
+        margin-top: -34px;
+      }
+
+      &-inner {
+        padding-top: 34px;
+        height: 241px;
+        background: none;
+      }
+
+      &-combobox {
+        display: inline-block;
+        background-color: white;
+        border-top: 1px solid #e9e9e9;
+      }
+      &-select {
+        width: 71px;
+
+        ul {
+          max-height: 206px;
+        }
+      }
+    }
+    .@{calendar-prefix-cls}-footer-btn {
+      padding-right: 12px;
+      display: block;
+      &::after {
+        content: 'x';
+        height: 0;
+        font-size: 0;
+        overflow: hidden;
+        clear: both;
+      }
+    }
+    .@{calendar-prefix-cls}-ok-btn {
+      position: static;
+      height: 22px;
+    }
+    .@{calendar-prefix-cls}-footer .@{calendar-prefix-cls}-time-picker-btn {
+      margin-right: 12px;
+    }
+    .@{calendar-prefix-cls}-today-btn {
+      margin: 8px 12px;
+      height: 22px;
+      line-height: 22px;
+    }
   }
 }
diff --git a/components/date-picker/style/TimePicker.less b/components/date-picker/style/TimePicker.less
index e3181bfa63..28172a9e0e 100644
--- a/components/date-picker/style/TimePicker.less
+++ b/components/date-picker/style/TimePicker.less
@@ -1,32 +1,264 @@
-.@{calendar-prefix-cls}-time {
-  // Change display order in DOM
-  .@{calendar-prefix-cls}-input-wrap {
-    direction: rtl;
-    .@{calendar-prefix-cls}-date-input-wrap,
-    .@{calendar-prefix-cls}-time-picker-wrap {
-      direction: ltr;
-      display: inline-block;
+
+
+.@{timepicker-prefix-cls} {
+  position: absolute;
+  width: 100%;
+  top: 34px;
+  background-color: white;
+  height: 206px;
+
+  &-panel {
+    z-index: @zindex-picker;
+    position: absolute;
+    width: 100%;
+  }
+
+  &-inner {
+    display: inline-block;
+    position: relative;
+    outline: none;
+    list-style: none;
+    font-size: 12px;
+    text-align: left;
+    background-color: #fff;
+    background-clip: padding-box;
+    line-height: 1.5;
+    overflow: hidden;
+  }
+
+  &-input {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    width: 100%;
+    cursor: auto;
+    line-height: 1.5;
+    outline: 0;
+
+    &-wrap {
+      display: none;
+      box-sizing: border-box;
+      position: relative;
+      padding: 6px;
+      border-bottom: 1px solid @border-color-split;
     }
-    .@{timepicker-prefix-cls}-panel,
-    .@{calendar-prefix-cls}-clear-btn {
-      direction: ltr;
+
+    &-invalid {
+      border-color: red;
     }
   }
-  .@{calendar-prefix-cls}-input,
-  .@{timepicker-prefix-cls}-input {
+
+  &-clear-btn {
+    position: absolute;
+    right: 5px;
+    cursor: pointer;
+    overflow: hidden;
+    width: 20px;
+    height: 20px;
+    text-align: center;
+    line-height: 20px;
+    top: 5px;
+    margin: 0;
+  }
+
+  &-clear-btn:after {
+    content: "\e631";
+    font-family: "anticon";
+    font-size: 12px;
+    color: #ccc;
+    display: inline-block;
+    line-height: 1;
+    width: 20px;
+    transition: color 0.3s ease;
+  }
+
+  &-clear-btn:hover:after {
+    color: #999;
+  }
+
+  &-narrow &-input-wrap {
+    max-width: 111px;
+  }
+
+  &-select {
+    float: left;
+    font-size: 12px;
+    border: 1px solid @border-color-split;
+    border-width: 0 1px;
+    margin-left: -1px;
+    box-sizing: border-box;
+    width: 77px;
+    overflow: hidden;
+    position: relative; // Fix chrome weird render bug
+
+    &:hover {
+      overflow-y: auto;
+    }
+
+    &:first-child {
+      border-left: 0;
+      margin-left: 0;
+    }
+
+    &:last-child {
+      border-right: 0;
+    }
+
+    ul {
+      list-style: none;
+      box-sizing: border-box;
+      margin: 0;
+      padding: 0;
+      width: 100%;
+      max-height: 206px;
+    }
+
+    li {
+      text-align: center;
+      list-style: none;
+      box-sizing: content-box;
+      margin: 0;
+      width: 100%;
+      height: 24px;
+      line-height: 24px;
+      cursor: pointer;
+      user-select: none;
+      transition: background 0.3s ease;
+    }
+
+    li:last-child:after {
+      content: '';
+      height: 120px;
+      display: block;
+    }
+
+    li:hover {
+      background: tint(@primary-color, 90%);
+    }
+
+    li&-option-selected {
+      background: #f7f7f7;
+      font-weight: bold;
+    }
+
+    li&-option-disabled {
+      color: @btn-disable-color;
+      &:hover {
+        background: transparent;
+        cursor: @cursor-disabled;
+      }
+    }
+  }
+
+  &.slide-up-enter.slide-up-enter-active&-placement-topLeft,
+  &.slide-up-enter.slide-up-enter-active&-placement-topRight,
+  &.slide-up-appear.slide-up-appear-active&-placement-topLeft,
+  &.slide-up-appear.slide-up-appear-active&-placement-topRight {
+    animation-name: antSlideDownIn;
+  }
+
+  &.slide-up-enter.slide-up-enter-active&-placement-bottomLeft,
+  &.slide-up-enter.slide-up-enter-active&-placement-bottomRight,
+  &.slide-up-appear.slide-up-appear-active&-placement-bottomLeft,
+  &.slide-up-appear.slide-up-appear-active&-placement-bottomRight {
+    animation-name: antSlideUpIn;
+  }
+
+  &.slide-up-leave.slide-up-leave-active&-placement-topLeft,
+  &.slide-up-leave.slide-up-leave-active&-placement-topRight {
+    animation-name: antSlideDownOut;
+  }
+
+  &.slide-up-leave.slide-up-leave-active&-placement-bottomLeft,
+  &.slide-up-leave.slide-up-leave-active&-placement-bottomRight {
+    animation-name: antSlideUpOut;
+  }
+}
+
+.@{timepicker-prefix-cls} {
+  display: inline-block;
+  outline: none;
+  font-size: @font-size-base;
+
+  &-input {
     .input;
-    border-radius: @border-radius-sm;
-    height: @input-height-sm;
-    width: 96px;
-    margin-right: 6px;
+    width: 100px;
   }
-  .@{calendar-prefix-cls}-input {
-    padding-right: 21px;
+
+  &-large &-input {
+    .input-lg;
   }
-  .@{timepicker-prefix-cls}-panel {
-    min-width: 168px;
+
+  &-small &-input {
+    .input-sm;
   }
-  .@{timepicker-prefix-cls}-icon {
-    display: none;
+
+  &-open {
+    opacity: 0;
+  }
+
+  &-icon {
+    position: absolute;
+    user-select: none;
+    transition: all .3s @ease-in-out;
+    width: 12px;
+    height: 12px;
+    line-height: 12px;
+    right: 8px;
+    color: #999;
+    top: 50%;
+    margin-top: -6px;
+    &:after {
+      content: "\e643";
+      font-family: "anticon";
+      font-size: 12px;
+      color: #999;
+      display: inline-block;
+      line-height: 1;
+      vertical-align: bottom;
+    }
   }
 }
+
+
+.@{calendar-prefix-cls} {
+  &-time {
+    .@{calendar-prefix-cls}-day-select {
+      padding: 0 2px;
+      font-weight: bold;
+      display: inline-block;
+      color: #666;
+      line-height: 34px;
+    }
+
+    .@{calendar-prefix-cls}-footer {
+      border-top: 1px solid #ccc;
+      padding: 10px 0;
+      text-align: right;
+      position: relative;
+      height: auto;
+      line-height: auto;
+
+      &-btn {
+        line-height: 1.5;
+        text-align: right;
+      }
+
+      .@{calendar-prefix-cls}-today-btn {
+        float: left;
+        margin: 0;
+        padding-left: 12px;
+      }
+
+      .@{calendar-prefix-cls}-time-picker-btn {
+        display: inline-block;
+        text-align: center;
+        margin-right: 60px;
+
+        &-disabled {
+          color: #ccc
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/components/date-picker/style/index.less b/components/date-picker/style/index.less
index 94126f5483..bfe71a54bd 100644
--- a/components/date-picker/style/index.less
+++ b/components/date-picker/style/index.less
@@ -4,7 +4,7 @@
 @import "../../button/style/mixin";
 
 @calendar-prefix-cls: ant-calendar;
-@timepicker-prefix-cls: ant-time-picker;
+@timepicker-prefix-cls: ant-calendar-time-picker;
 
 @import "Picker";
 @import "Calendar";
diff --git a/components/date-picker/wrapPicker.tsx b/components/date-picker/wrapPicker.tsx
index d8599904da..cb61f1d8f7 100644
--- a/components/date-picker/wrapPicker.tsx
+++ b/components/date-picker/wrapPicker.tsx
@@ -1,6 +1,6 @@
 import { PropTypes } from 'react';
 import * as React from 'react';
-import TimePicker from 'rc-time-picker';
+import TimePickerPanel from 'rc-time-picker/lib/module/Panel';
 import DateTimeFormat from 'gregorian-calendar-format';
 import GregorianCalendar from 'gregorian-calendar';
 import classNames from 'classnames';
@@ -87,10 +87,10 @@ export default function wrapPicker(Picker, defaultFormat) {
         showHour: timeFormat && timeFormat.indexOf('HH') >= 0,
       };
       const timePicker = props.showTime ? (
-        <TimePicker
+        <TimePickerPanel
           {...rcTimePickerProps}
           {...props.showTime}
-          prefixCls="ant-time-picker"
+          prefixCls="ant-calendar-time-picker"
           placeholder={locale.timePickerLocale.placeholder}
           locale={locale.timePickerLocale}
           transitionName="slide-up"
diff --git a/components/input/Input.tsx b/components/input/Input.tsx
index 7e21e60e53..28499876ae 100644
--- a/components/input/Input.tsx
+++ b/components/input/Input.tsx
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { Component, PropTypes } from 'react';
 import classNames from 'classnames';
 import calculateNodeHeight from './calculateNodeHeight';