diff --git a/source/components/index.markdown b/source/components/index.markdown
index 13aab0da185..32daba30a6d 100644
--- a/source/components/index.markdown
+++ b/source/components/index.markdown
@@ -191,6 +191,12 @@ the manufacturers of these devices.
 <td><a href='/components/keyboard.html'>Keyboard</a></td>
 <td>Simulate key presses on the host machine</td>
 </tr>
+
+<tr>
+<td><img src='/images/supported_brands/openweathermap.png' class='brand' /></td>
+<td><a href='/components/openweathermap.html'>OpenWeatherMap</a></td>
+<td>Display current meteorological data from your location</td>
+</tr>
 </table>
 
 <p class='note'>
diff --git a/source/components/sensor.openweathermap.markdown b/source/components/sensor.openweathermap.markdown
new file mode 100644
index 00000000000..0f529d6ab69
--- /dev/null
+++ b/source/components/sensor.openweathermap.markdown
@@ -0,0 +1,30 @@
+---
+layout: page
+title: "OpenWeatherMap support"
+description: "Instructions how to integrate OpenWeatherMap within Home Assistant."
+date: 2015-04-25 9:06
+sidebar: false
+comments: false
+sharing: true
+footer: true
+---
+
+<img src='/images/supported_brands/openweathermap.png' class='brand pull-right' />
+The openweathermap platform uses [OpenWeatherMap](http://openweathermap.org/) as a source for meteorological data for your location. 
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  platform: openweathermap
+  api_key: YOUR_API_KEY
+  monitored_variables:
+    - type: 'weather'
+    - type: 'temperature'
+    - type: 'wind_speed'
+    - type: 'humidity'
+    - type: 'pressure'
+    - type: 'clouds'
+    - type: 'rain'
+    - type: 'snow'
+```
+
diff --git a/source/images/supported_brands/openweathermap.png b/source/images/supported_brands/openweathermap.png
new file mode 100644
index 00000000000..376e31c30a3
Binary files /dev/null and b/source/images/supported_brands/openweathermap.png differ