diff --git a/source/_components/weather.zamg.markdown b/source/_components/weather.zamg.markdown
deleted file mode 100644
index 31dbe220558..00000000000
--- a/source/_components/weather.zamg.markdown
+++ /dev/null
@@ -1,53 +0,0 @@
----
-layout: page
-title: "ZAMG Weather"
-description: "Instructions on how to integrate ZAMG sensors within Home Assistant."
-date: 2016-12-06 08:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: zamg.png
-ha_category: Weather
-ha_release: 0.39
-ha_iot_class: Cloud Polling
----
-
-The `zamg` platform uses meteorological details published by the Austrian weather service [Zentralanstalt für Meteorologie und Geodynamik (ZAMG)](https://www.zamg.ac.at).
-
-Only observations for capital cities are publicly available. You can check the list of stations in [CSV format](http://www.zamg.ac.at/ogd).
-
-## {% linkable_title Configuration %}
-
-To add ZAMG to your installation, add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-weather:
-  - platform: zamg
-```
-
-{% configuration %}
-station_id:
-  description: The ID number for a supported ZAMG station.
-  required: false
-  type: string
-name:
-  description: A name for the weather platform.
-  required: false
-  type: string
-latitude:
-  description: "Latitude coordinate to monitor weather of (required if **longitude** is specified)."
-  required: false
-  type: float
-  default: "Defaults to coordinates defined in your `configuration.yaml` file."
-longitude:
-  description: "Longitude coordinate to monitor weather of (required if **latitude** is specified)."
-  required: false
-  type: float
-  default: "Defaults to coordinates defined in your `configuration.yaml` file."
-{% endconfiguration %}
-
-<p class='note'>
-This platform is an alternative to the [`zamg`](/components/sensor.zamg/) sensor. The `weather` platform is easier to configure but less customizable and doesn't have support for conditions which is a key feature of the `weather` platforms.
-</p>
diff --git a/source/_components/zamg.markdown b/source/_components/zamg.markdown
index 1a953a77058..06cc010f544 100644
--- a/source/_components/zamg.markdown
+++ b/source/_components/zamg.markdown
@@ -1,25 +1,66 @@
 ---
 layout: page
-title: "ZAMG Sensor"
-description: "Instructions on how to integrate ZAMG sensors within Home Assistant."
+title: "ZAMG"
+description: "Instructions on how to integrate ZAMG within Home Assistant."
 date: 2016-12-06 08:00
 sidebar: true
 comments: false
 sharing: true
 footer: true
 logo: zamg.png
-ha_category: Weather
+ha_category:
+  - Weather
+  - Sensor
 ha_release: 0.35
 ha_iot_class: Cloud Polling
 redirect_from:
  - /components/sensor.zamg/
+ - /components/weather.zamg/
 ---
 
 The `zamg` platform uses meteorological details published by the Austrian weather service [Zentralanstalt für Meteorologie und Geodynamik (ZAMG)](https://www.zamg.ac.at).
 
 Only observations for capital cities are publicly available. You can check the list of stations in [CSV format](http://www.zamg.ac.at/ogd).
 
-To add ZAMG to your installation, add the following to your `configuration.yaml` file:
+There is currently support for the following device types within Home Assistant:
+
+- **[Weather](#weather)** - Easier to configure but less customizable and doesn't have support for conditions which is a key feature of the `weather` platforms.
+- **[Sensor](#sensor)**
+
+## {% linkable_title Weather %}
+
+To add ZAMG weather platform to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+weather:
+  - platform: zamg
+```
+
+{% configuration %}
+station_id:
+  description: The ID number for a supported ZAMG station.
+  required: false
+  type: string
+name:
+  description: A name for the weather platform.
+  required: false
+  type: string
+latitude:
+  description: "Latitude coordinate to monitor weather of (required if **longitude** is specified)."
+  required: false
+  type: float
+  default: "Defaults to coordinates defined in your `configuration.yaml` file."
+longitude:
+  description: "Longitude coordinate to monitor weather of (required if **latitude** is specified)."
+  required: false
+  type: float
+  default: "Defaults to coordinates defined in your `configuration.yaml` file."
+{% endconfiguration %}
+
+## {% linkable_title Sensor %}
+
+To add ZAMG sensor platform to your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
@@ -89,7 +130,3 @@ sensor:
       - temperature
       - humidity
 ```
-
-<p class='note'>
-This sensor is an alternative to the [`zamg`](/components/weather.zamg/) weather platform. The `zamg` weather platform is easier to configure but less customizable.
-</p>