diff --git a/source/_components/openweathermap.markdown b/source/_components/openweathermap.markdown
index c8c1904c929..5789629c979 100644
--- a/source/_components/openweathermap.markdown
+++ b/source/_components/openweathermap.markdown
@@ -8,19 +8,27 @@ comments: false
 sharing: true
 footer: true
 logo: openweathermap.png
-ha_category: Weather
+ha_category:
+  - Weather
+  - Sensor
 ha_release: 0.32
 ha_iot_class: Cloud Polling
 redirect_from:
  - /components/weather.openweathermap/
+ - /components/sensor.openweathermap/
 ---
 
 The `openweathermap` weather platform uses [OpenWeatherMap](http://openweathermap.org/) as a source for current meteorological data for your location.
 
-## {% linkable_title Configuration %}
+There is currently support for the following device types within Home Assistant:
+
+- [Sensor](#sensor)
+- [Weather](#weather)
 
 You need an API key which is free but requires a [registration](http://home.openweathermap.org/users/sign_up).
 
+## {% linkable_title Weather %}
+
 To add OpenWeatherMap to your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
@@ -60,3 +68,67 @@ longitude:
 <p class='note'>
 This platform is an alternative to the [`openweathermap`](/components/sensor.openweathermap/) sensor.
 </p>
+
+## {% linkable_title Sensor %}
+
+The `openweathermap` platform uses [OpenWeatherMap](http://openweathermap.org/) as a source for current meteorological data for your location. The `forecast` will show you the condition in 3h.
+
+To add OpenWeatherMap sensor to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: openweathermap
+    api_key: YOUR_API_KEY
+    monitored_conditions:
+      - weather
+```
+
+{% configuration %}
+  api_key:
+    description: Your API key for OpenWeatherMap.
+    required: true
+    type: string
+  name:
+    description: Additional name for the sensors. Default to platform name.
+    required: false
+    default: OWM
+    type: string
+  forecast:
+    description: Enables the forecast. The default is to display the current conditions.
+    required: false
+    default: false
+    type: string
+  language:
+    description: The language in which you want text results to be returned. It's a two-characters string, e.g., `en`, `es`, `ru`, `it`, etc.
+    required: false
+    default: en
+    type: string
+  monitored_conditions:
+    description: Conditions to display in the frontend.
+    required: true
+    type: list
+    keys:
+      weather:
+        description: A human-readable text summary.
+      temperature:
+        description: The current temperature.
+      wind_speed:
+        description: The wind speed.
+      wind_bearing:
+        description: The wind bearing.
+      humidity:
+        description: The relative humidity.
+      pressure:
+        description: The sea-level air pressure in millibars.
+      clouds:
+        description: Description about cloud coverage.
+      rain:
+        description: The rain volume.
+      snow:
+        description: The snow volume.
+      weather_code:
+        description: The current weather condition code.
+{% endconfiguration %}
+
+Details about the API are available in the [OpenWeatherMap documentation](http://openweathermap.org/api).
diff --git a/source/_components/sensor.openweathermap.markdown b/source/_components/sensor.openweathermap.markdown
deleted file mode 100644
index 04a0c9e6ec8..00000000000
--- a/source/_components/sensor.openweathermap.markdown
+++ /dev/null
@@ -1,78 +0,0 @@
----
-layout: page
-title: "OpenWeatherMap Sensor"
-description: "Instructions on how to integrate OpenWeatherMap within Home Assistant."
-date: 2015-04-25 9:06
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: openweathermap.png
-ha_category: Weather
-ha_release: pre 0.7
-ha_iot_class: Cloud Polling
----
-
-The `openweathermap` platform uses [OpenWeatherMap](http://openweathermap.org/) as a source for current meteorological data for your location. The `forecast` will show you the condition in 3 h.
-
-You need an API key which is free but requires a [registration](http://home.openweathermap.org/users/sign_up).
-
-To add OpenWeatherMap to your installation, add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-sensor:
-  - platform: openweathermap
-    api_key: YOUR_API_KEY
-    monitored_conditions:
-      - weather
-```
-
-{% configuration %}
-  api_key:
-    description: Your API key for OpenWeatherMap.
-    required: true
-    type: string
-  name:
-    description: Additional name for the sensors. Default to platform name.
-    required: false
-    default: OWM
-    type: string
-  forecast:
-    description: Enables the forecast. The default is to display the current conditions.
-    required: false
-    default: false
-    type: string
-  language:
-    description: The language in which you want text results to be returned. It's a two-characters string, e.g., `en`, `es`, `ru`, `it`, etc.
-    required: false
-    default: en
-    type: string
-  monitored_conditions:
-    description: Conditions to display in the frontend.
-    required: true
-    type: list
-    keys:
-      weather:
-        description: A human-readable text summary.
-      temperature:
-        description: The current temperature.
-      wind_speed:
-        description: The wind speed.
-      wind_bearing:
-        description: The wind bearing.
-      humidity:
-        description: The relative humidity.
-      pressure:
-        description: The sea-level air pressure in millibars.
-      clouds:
-        description: Description about cloud coverage.
-      rain:
-        description: The rain volume.
-      snow:
-        description: The snow volume.
-      weather_code:
-        description: The current weather condition code.
-{% endconfiguration %}
-
-Details about the API are available in the [OpenWeatherMap documentation](http://openweathermap.org/api).