diff --git a/source/_components/sensor.zamg.markdown b/source/_components/sensor.zamg.markdown
index f9d767448e9..7ce7bc96991 100644
--- a/source/_components/sensor.zamg.markdown
+++ b/source/_components/sensor.zamg.markdown
@@ -12,34 +12,11 @@ ha_category: Weather
ha_release: 0.35
---
-The `zamg` platform uses meteorological details published by the Austrian weather service [Zentralanstalt für
- Meteorologie und Geodynamik (ZAMG)](https://www.zamg.ac.at/).
+The `zamg` platform uses meteorological details published by the Austrian weather service
+[Zentralanstalt für Meteorologie und Geodynamik (ZAMG)](https://www.zamg.ac.at).
-The following stations are available:
-
-| `station_id` | Location |
-| :----------- |:---------------------|
-| 11010 | Linz/Hörsching |
-| 11012 | Kremsmünster |
-| 11022 | Retz |
-| 11035 | Wien/Hohe Warte |
-| 11036 | Wien/Schwechat |
-| 11101 | Bregenz |
-| 11121 | Innsbruck |
-| 11126 | Patscherkofel |
-| 11130 | Kufstein |
-| 11150 | Salzburg |
-| 11155 | Feuerkogel |
-| 11157 | Aigen im Ennstal |
-| 11171 | Mariazell |
-| 11190 | Eisenstadt |
-| 11204 | Lienz |
-| 11240 | Graz/Flughafen |
-| 11244 | Bad Gleichenberg |
-| 11265 | Villacher Alpe |
-| 11331 | Klagenfurt/Flughafen |
-| 11343 | Sonnblick |
-| 11389 | St. Pölten |
+Only observations for capital cities are publically 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:
@@ -55,7 +32,7 @@ sensor:
Configuration variables:
-- **station_id** (*Required*): Your API key for http://openweathermap.org/.
+- **station_id** (*Optional*): The ID number for a supported ZAMG station.
- **name** (*Optional*): Additional name for the sensors. Defaults to platform name.
- **monitored_conditions** array (*Required*): Conditions to display in the frontend.
- **pressure**: Pressure at station level
@@ -65,8 +42,12 @@ Configuration variables:
- **wind_bearing**: Wind bearing
- **wind_max_speed**: Top wind speed
- **wind_max_bearing**: Top wind bearing
- - **sun_last_hour**: Sun last hourpercentage
+ - **sun_last_hour**: Sun last hour percentage
- **temperature**: Temperature
- **precipitation**: Precipitation
- **dewpoint**: Dew point
+
+This sensor is an alternative to the [`zamg`](/components/weather.zamg/) weather platform.
+The weather platform is easier to configure but less customisable.
+
diff --git a/source/_components/weather.zamg.markdown b/source/_components/weather.zamg.markdown
new file mode 100644
index 00000000000..84f3ae4909b
--- /dev/null
+++ b/source/_components/weather.zamg.markdown
@@ -0,0 +1,37 @@
+---
+layout: page
+title: "ZAMG Weather"
+description: "Instructions 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
+---
+
+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 publically 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:
+
+```yaml
+# Example configuration.yaml entry
+weather:
+ - platform: zamg
+```
+
+Configuration variables:
+
+- **station_id** (*Optional*): The ID number for a supported ZAMG station.
+- **name** (*Optional*): A name for the weather platform.
+
+
+This platform is an alternative to the [`zamg`](/components/sensor.zamg/) sensor.
+The weather platform is easier to configure but less customisable.
+