diff --git a/diagrams/gis/desktop.py b/diagrams/gis/desktop.py
new file mode 100644
index 00000000..0ff6c761
--- /dev/null
+++ b/diagrams/gis/desktop.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _GIS
+
+
+class _Desktop(_GIS):
+    _type = "desktop"
+    _icon_dir = "resources/gis/desktop"
+
+
+class Qgis(_Desktop):
+    _icon = "qgis.png"
+
+
+# Aliases
diff --git a/diagrams/gis/server.py b/diagrams/gis/server.py
index b7b5b6c9..0dfc8c8c 100644
--- a/diagrams/gis/server.py
+++ b/diagrams/gis/server.py
@@ -12,4 +12,12 @@ class Geoserver(_Server):
     _icon = "geoserver.png"
 
 
+class Mapserver(_Server):
+    _icon = "mapserver.png"
+
+
+class QgisServer(_Server):
+    _icon = "qgis-server.png"
+
+
 # Aliases
diff --git a/docs/nodes/gis.md b/docs/nodes/gis.md
index da66c33c..f4fa8654 100644
--- a/docs/nodes/gis.md
+++ b/docs/nodes/gis.md
@@ -5,8 +5,20 @@ title: GIS
 
 Node classes list of gis provider.
 
+## gis.desktop
+
+
+<img width="30" src="/img/resources/gis/desktop/qgis.png" alt="Qgis" style="float: left; padding-right: 5px;" >
+**diagrams.gis.desktop.Qgis**
+
 ## gis.server
 
 
 <img width="30" src="/img/resources/gis/server/geoserver.png" alt="Geoserver" style="float: left; padding-right: 5px;" >
 **diagrams.gis.server.Geoserver**
+
+<img width="30" src="/img/resources/gis/server/mapserver.png" alt="Mapserver" style="float: left; padding-right: 5px;" >
+**diagrams.gis.server.Mapserver**
+
+<img width="30" src="/img/resources/gis/server/qgis-server.png" alt="QgisServer" style="float: left; padding-right: 5px;" >
+**diagrams.gis.server.QgisServer**
diff --git a/resources/gis/desktop/qgis.png b/resources/gis/desktop/qgis.png
new file mode 100644
index 00000000..3dc4b1cd
Binary files /dev/null and b/resources/gis/desktop/qgis.png differ
diff --git a/resources/gis/server/mapserver.png b/resources/gis/server/mapserver.png
new file mode 100644
index 00000000..5af8f7fd
Binary files /dev/null and b/resources/gis/server/mapserver.png differ
diff --git a/resources/gis/server/qgis-server.png b/resources/gis/server/qgis-server.png
new file mode 100644
index 00000000..3dc4b1cd
Binary files /dev/null and b/resources/gis/server/qgis-server.png differ
diff --git a/website/static/img/resources/gis/desktop/qgis.png b/website/static/img/resources/gis/desktop/qgis.png
new file mode 100644
index 00000000..3dc4b1cd
Binary files /dev/null and b/website/static/img/resources/gis/desktop/qgis.png differ
diff --git a/website/static/img/resources/gis/server/mapserver.png b/website/static/img/resources/gis/server/mapserver.png
new file mode 100644
index 00000000..5af8f7fd
Binary files /dev/null and b/website/static/img/resources/gis/server/mapserver.png differ
diff --git a/website/static/img/resources/gis/server/qgis-server.png b/website/static/img/resources/gis/server/qgis-server.png
new file mode 100644
index 00000000..3dc4b1cd
Binary files /dev/null and b/website/static/img/resources/gis/server/qgis-server.png differ