diff --git a/source/components/index.markdown b/source/components/index.markdown
index 9a87633a9c7..d91c44291bc 100644
--- a/source/components/index.markdown
+++ b/source/components/index.markdown
@@ -243,6 +243,12 @@ the manufacturers of these devices.
 <td>Display details about the Bitcoin Network and your Blockchain.info online wallet.</td>
 </tr>
 
+<tr>
+<td></td>
+<td><a href='/components/sensor.swiss_public_transport.html'>Swiss Public Transport</a></td>
+<td>Display timetable data for traveling in Switzerland.</td>
+</tr>
+
 <tr>
 <td></td>
 <td><a href='/components/sensor.time_date.html'>Time & Date</a></td>
diff --git a/source/components/sensor.swiss_public_transport.markdown b/source/components/sensor.swiss_public_transport.markdown
new file mode 100644
index 00000000000..af9f4e437d0
--- /dev/null
+++ b/source/components/sensor.swiss_public_transport.markdown
@@ -0,0 +1,29 @@
+---
+layout: page
+title: "Swiss Public Transport support"
+description: "Instructions how to integrate timetable data for travelling in Switzerland within Home Assistant."
+date: 2015-06-02 21:45
+sidebar: false
+comments: false
+sharing: true
+footer: true
+---
+
+The swiss public transport sensor will give you the next two departure times from a given location to another one in Switzerland.
+
+The [Stationboard](http://transport.opendata.ch/examples/stationboard.html) website can help to determine the exact name of the start and the end station. With the station names it's necessary to search for the ID of those stations:
+
+http://transport.opendata.ch/v1/locations?query=[Station name]
+
+If the score is 100 ("score":"100" in the response), it is a perfect match. Then add the data to your `configuration.yaml` file as shown in the example:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  platform: swiss_public_transport
+  from: STATION_ID
+  to: STATION_ID
+
+```
+
+The public timetables are coming from [Swiss public transport](http://transport.opendata.ch).