diff --git a/source/_components/weather.openweathermap.markdown b/source/_components/weather.openweathermap.markdown
index bf704c2984b..f0d9d1f93bb 100644
--- a/source/_components/weather.openweathermap.markdown
+++ b/source/_components/weather.openweathermap.markdown
@@ -28,14 +28,33 @@ weather:
     api_key: YOUR_API_KEY
 ```
 
-Configuration variables:
-
-- **api_key** (*Required*): Your API key for http://openweathermap.org/.
-- **name** (*Optional*): Name to use in the frontend.
-- **mode** (*Optional*): Can specify `hourly` or `daily`. Select `hourly` for a three-hour forecast or `daily` for daily forecast. Defaults to `hourly`.
-- **latitude** (*Optional*): Latitude of the location to display the weather. Defaults to the latitude in your `configuration.yaml` file. 
-- **longitude** (*Optional*): Longitude of the location to display the weather. Defaults to the longitude in your `configuration.yaml` file.
+{% configuration %}
+api_key:
+  required: true
+  description: Your API key for [OpenWeatherMap](http://openweathermap.org/).
+  type: string
+name:
+  required: false
+  description: Name to use in the frontend.
+  default: OpenWeatherMap
+  type: string
+mode:
+  required: false
+  description: "Can specify `hourly` or `daily`. Select `hourly` for a three-hour forecast or `daily` for daily forecast."
+  default: "`hourly`"
+  type: string
+latitude:
+  required: false
+  description: Latitude of the location to display the weather.
+  default: "The latitude in your `configuration.yaml` file."
+  type: float
+longitude:
+  required: false
+  description: Longitude of the location to display the weather.
+  default: "The longitude in your `configuration.yaml` file."
+  type: float
+{% endconfiguration %}
 
 <p class='note'>
-This platform is an alternative to the [`openweathermap`](/components/sensor.openweathermap/) sensor. 
+This platform is an alternative to the [`openweathermap`](/components/sensor.openweathermap/) sensor.
 </p>