diff --git a/docs/dev/web/config-mode.rst b/docs/dev/web/config-mode.rst
index f69f50c2bef2f6d972aadcbae766d4ba933f07ec..0a223f97231498e0237eb956bfbb2e6c12acb6b0 100644
--- a/docs/dev/web/config-mode.rst
+++ b/docs/dev/web/config-mode.rst
@@ -20,7 +20,7 @@ gluon-config-mode-hostname
 gluon-config-mode-geo-location
     Enables the user to set the geographical location of the node.
 
-gluon-config-mode-geo-location-osm
+:doc:`../../package/gluon-config-mode-geo-location-osm`
     Lets the user click on a map to select the geographical location through a OSM map
 
 gluon-config-mode-contact-info
diff --git a/docs/index.rst b/docs/index.rst
index 6fb95706d22d8cba36abd6f4c61e05cf6c2407d0..e194555917d85f6f450e892ec44554dfa7e828b7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -64,6 +64,7 @@ Several Freifunk communities in Germany use Gluon as the foundation of their Fre
 
   package/gluon-client-bridge
   package/gluon-config-mode-domain-select
+  package/gluon-config-mode-geo-location-osm
   package/gluon-ebtables-filter-multicast
   package/gluon-ebtables-filter-ra-dhcp
   package/gluon-ebtables-limit-arp
diff --git a/docs/package/gluon-config-mode-geo-location-osm.png b/docs/package/gluon-config-mode-geo-location-osm.png
new file mode 100644
index 0000000000000000000000000000000000000000..f03226049f326a920fe07d95b7ef572534b02025
Binary files /dev/null and b/docs/package/gluon-config-mode-geo-location-osm.png differ
diff --git a/docs/package/gluon-config-mode-geo-location-osm.rst b/docs/package/gluon-config-mode-geo-location-osm.rst
new file mode 100644
index 0000000000000000000000000000000000000000..5b0b9eaad8a717d5b4babdfd1dd567c2726f7832
--- /dev/null
+++ b/docs/package/gluon-config-mode-geo-location-osm.rst
@@ -0,0 +1,11 @@
+.. _package-gluon-config-mode-geo-location-osm:
+
+gluon-config-mode-geo-location-osm
+==================================
+
+When package *gluon-config-mode-geo-location-osm* is enabled, the configuration wizard will
+try to load an OSM-based map to allow the user to specify the node location.
+Loading the map requires a working internet connection, for example via WLAN
+(while connected to the Gluon node via Ethernet).
+
+.. image:: gluon-config-mode-geo-location-osm.png