diff --git a/source/_components/demo.markdown b/source/_components/demo.markdown
index f1c25737208..5f25f13646c 100644
--- a/source/_components/demo.markdown
+++ b/source/_components/demo.markdown
@@ -22,6 +22,7 @@ Available demo platforms:
 - [Climate](/components/climate/) (`climate`)
 - [Cover](/components/cover/) (`cover`)
 - [Fan](/components/fan/) (`fan`)
+- [Geo Location](/components/geo_location/) (`geo_location`)
 - [Image Processing](/components/image_processing/) (`image_processing`)
 - [Light](/components/light/) (`light`)
 - [Lock](/components/lock/) (`lock`)
diff --git a/source/_components/geo_location.markdown b/source/_components/geo_location.markdown
new file mode 100644
index 00000000000..2990c019514
--- /dev/null
+++ b/source/_components/geo_location.markdown
@@ -0,0 +1,16 @@
+---
+layout: page
+title: "Geo Location"
+description: "Instructions on how to integrate geo location aware platforms into Home Assistant."
+date: 2018-08-27 08:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+ha_category: Other
+ha_release: "0.78"
+---
+
+Geo Location aware entities are typically related to events in the real world in the vicinity of Home Assistant's location, like for example weather events, bush fires or earthquakes.
+
+Entities can have associated geo location coordinates (latitude and longitude) so that they are displayed on the map. The distance from the entity's coordinates to Home Assistant's location can be used for filtering.