diff --git a/source/_components/sensor.wunderground.markdown b/source/_components/sensor.wunderground.markdown
new file mode 100644
index 00000000000..862e44f86b9
--- /dev/null
+++ b/source/_components/sensor.wunderground.markdown
@@ -0,0 +1,94 @@
+---
+layout: page
+title: "Weather Underground (Wunderground)"
+description: "Instructions how to integrate Weather Underground (Wunderground) Weather within Home Assistant."
+date: 2016-08-18
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: wunderground.png
+ha_category: Weather
+ha_release: 0.27
+---
+
+
+The `wunderground` platform uses [Weather Underground](http://www.wunderground.com.com) as an source for current weather information. 
+
+<p class='note warning'>
+Obtain Wunderground API [here](https://www.wunderground.com/weather/api). Free account allows 500 requests per day or 10 per minute.
+</p>
+
+To add Wunderground to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+    platform: wunderground
+    api_key: your_api_key
+    pws_id: enter_pws_id
+    monitored_conditions:
+      - weather
+      - temp_f
+      - temp_c
+      - station_id
+      - feelslike_c
+      - feelslike_f
+      - feelslike_string
+      - heat_index_c
+      - heat_index_f
+      - heat_index_string
+      - dewpoint_c
+      - dewpoint_f
+      - dewpoint_string
+      - wind_kph
+      - wind_mph
+      - UV
+      - pressure_in
+      - pressure_mb
+      - wind_dir
+      - wind_string
+      - relative_humidity
+      - visibility_mi
+      - visibility_km
+      - precip_today_in
+      - precip_today_metric
+      - precip_today_string
+      - solarradiation
+
+```
+
+Configuration variables:
+- **api_key** (Required): See above
+- **pws_id** (Optional): You can enter your PWS id. Current list of Wunderground PWS stations is available [here](https://www.wunderground.com/weatherstation/ListStations.asp). If you do not enter the PWS ID, the current location information (latitude and longitude) from your `configuration.yaml` will be used to display weather conditions. 
+- **monitored_conditions** array (*Required*): Conditions to display in the frontend. The following conditions can be monitored.
+  - **weather**: A human-readable text summary with picture from Wunderground.
+  - **temp_f**: Current temperature in Fahrenheit
+  - **temp_c**: Current temperature in Celsius
+  - **station_id**: Your personal weather station (PWS) ID
+  - **feelslike_c**: Feels like (or apparent) temperature in celsius
+  - **feelslike_f**: Feels like (or apparent) temperature in Fahrenheit
+  - **feelslike_string**: Text summary of how the current teperature feels like
+  - **heat_index_c**: Heat index (combined effects of the temperature and humidity of the air) in Celsius
+  - **heat_index_f**: Heat index (combined effects of the temperature and humidity of the air) in Fahrenheit
+  - **heat_index_string**: Text summary of current heat index
+  - **dewpoint_c**: Temperature in celsius below which water droplets begin to condense and dew can form
+  - **dewpoint_f**: Temperature in fahrenheit below which water droplets begin to condense and dew can form
+  - **dewpoint_string**: Text summary of dew point
+  - **wind_kph**: Current wind speed in kph
+  - **wind_mph**: Current wind speed in mph
+  - **UV**: Current levels of UV radiation. See [here](https://www.wunderground.com/resources/health/uvindex.asp) for explanation.  
+  - **pressure_in**: Atmospheric air pressure in inches
+  - **pressure_mb**: Atmospheric air pressure in millibars
+  - **wind_dir**: Wind direction
+  - **wind_string**: Text summary of current wind conditions
+  - **relative_humidity**: Reltive humidity
+  - **visibility_mi**: Average visibility in miles
+  - **visibility_km**: Average visibility in km
+  - **precip_today_in**: Total precipitation in inches
+  - **precip_today_metric**: Total precipitation in metric units
+  - **precip_today_string**: Text summary of precipitation today
+  - **solarradiation**: Current levels of solar radiation
+
+Additional details about the API are available [here](https://www.wunderground.com/weather/api/d/docs).
+