diff --git a/source/components/index.markdown b/source/components/index.markdown
index cd274d61dd1..2f8790a6acf 100644
--- a/source/components/index.markdown
+++ b/source/components/index.markdown
@@ -209,6 +209,12 @@ the manufacturers of these devices.
 <td><a href='/components/sensor.openweathermap.html'>OpenWeatherMap</a></td>
 <td>Display current meteorological data from your location</td>
 </tr>
+
+<tr>
+<td></td>
+<td><a href='/components/time_date.html'>Time & Date</a></td>
+<td>Displays the time and the date.</td>
+</tr>
 </table>
 
 <p class='note'>
diff --git a/source/components/sensor.time_date.markdown b/source/components/sensor.time_date.markdown
new file mode 100644
index 00000000000..e85b81fa7e8
--- /dev/null
+++ b/source/components/sensor.time_date.markdown
@@ -0,0 +1,30 @@
+---
+layout: page
+title: "Time & Date support"
+description: "Instructions how to integrate the time and the date within Home Assistant."
+date: 2015-05-08 17:15
+sidebar: false
+comments: false
+sharing: true
+footer: true
+---
+
+The time and date platform simple displays the time, the date, or both.
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  platform: time_date
+  monitored_variables:
+    - type: 'time'
+    - type: 'date'
+    - type: 'date_time'
+    - type: 'time_date'
+```
+
+The types *date_time* and *time_date* shows the date and the time. The other two types just the time or the date. 
+
+<p class='img'>
+  <img src='{{site_root}}/images/screenshots/time_date.png' />
+</p>
+
diff --git a/source/images/screenshots/time_date.png b/source/images/screenshots/time_date.png
new file mode 100644
index 00000000000..15bd96773b5
Binary files /dev/null and b/source/images/screenshots/time_date.png differ