diff --git a/Doc/Sdi/Ref/Cloud/lightning.png b/Doc/Sdi/Ref/Cloud/lightning.png
new file mode 100644
index 0000000000000000000000000000000000000000..51cf277d95634f483d94f84dd327cc5d71a60d93
Binary files /dev/null and b/Doc/Sdi/Ref/Cloud/lightning.png differ
diff --git a/Doc/Sdi/cloud.xml b/Doc/Sdi/cloud.xml
index 664ced880afa96b562aa2418ccd37cf1b53157b1..0a3cde6f4adfab40ead680df205160d1fac89c48 100644
--- a/Doc/Sdi/cloud.xml
+++ b/Doc/Sdi/cloud.xml
@@ -12,55 +12,75 @@
   <title>File cloud</title>
 
   <figure xml:id="cloud_fig_general">
-    <title>General</title>
+    <title>File services</title>
 
-    <itemizedlist>
-      <listitem>
-        <para>Centralized remote file storage.</para>
-      </listitem>
+    <informaltable border="0">
+      <tr>
+        <td valign="top"><itemizedlist>
+            <listitem>
+              <para>Centralized remote file storage.</para>
+            </listitem>
 
-      <listitem>
-        <para>Proprietary protocols.</para>
-      </listitem>
+            <listitem>
+              <para>Proprietary protocols.</para>
+            </listitem>
 
-      <listitem>
-        <para>File Up- and Download.</para>
-      </listitem>
+            <listitem>
+              <para>File Up- and Download.</para>
+            </listitem>
+          </itemizedlist></td>
 
-      <listitem>
-        <para>Multi client synchronization.</para>
-      </listitem>
+        <td valign="top"><itemizedlist>
+            <listitem>
+              <para>Multi client synchronization.</para>
+            </listitem>
 
-      <listitem>
-        <para>Ubiquitous access.</para>
-      </listitem>
-    </itemizedlist>
+            <listitem>
+              <para>Network file system support.</para>
+            </listitem>
+
+            <listitem>
+              <para>Ubiquitous access.</para>
+            </listitem>
+          </itemizedlist></td>
+      </tr>
+    </informaltable>
   </figure>
 
   <figure xml:id="cloud_fig_demands">
     <title>Customer demands</title>
 
-    <itemizedlist>
-      <listitem>
-        <para>Integrated backup.</para>
-      </listitem>
+    <informaltable border="0">
+      <tr>
+        <td valign="top"><itemizedlist>
+            <listitem>
+              <para>Integrated backup.</para>
+            </listitem>
 
-      <listitem>
-        <para>Versioning.</para>
-      </listitem>
+            <listitem>
+              <para>Versioning.</para>
+            </listitem>
 
-      <listitem>
-        <para>Sharing on user / group level.</para>
-      </listitem>
+            <listitem>
+              <para>Sharing on user / group level.</para>
+            </listitem>
 
-      <listitem>
-        <para>Secure access.</para>
-      </listitem>
+            <listitem>
+              <para>Secure access, Encryption</para>
+            </listitem>
+          </itemizedlist></td>
 
-      <listitem>
-        <para>Consistent availability.</para>
-      </listitem>
-    </itemizedlist>
+        <td valign="top"><itemizedlist>
+            <listitem>
+              <para>Consistent availability.</para>
+            </listitem>
+
+            <listitem>
+              <para>Federation support.</para>
+            </listitem>
+          </itemizedlist></td>
+      </tr>
+    </informaltable>
   </figure>
 
   <figure xml:id="cloud_fig_reasons">
@@ -82,15 +102,140 @@
       </listitem>
 
       <listitem>
-        <para>Economy of scale: Cheap hardware relying on replication.</para>
+        <para>Economy of scale: Cheap hardware, distributed system</para>
+      </listitem>
+    </itemizedlist>
+  </figure>
+
+  <figure xml:id="cloud_fig_services">
+    <title>Selected cloud file services</title>
+
+    <informaltable border="0">
+      <tr>
+        <td valign="top"><itemizedlist>
+            <listitem>
+              <para><productname>Google Drive</productname></para>
+            </listitem>
+
+            <listitem>
+              <para><productname>Dropbox</productname></para>
+            </listitem>
+
+            <listitem>
+              <para><productname>OneDrive</productname></para>
+            </listitem>
+
+            <listitem>
+              <para><productname>iCloud Drive</productname></para>
+            </listitem>
+          </itemizedlist></td>
+
+        <td valign="top"><itemizedlist>
+            <listitem>
+              <para><productname>Box</productname></para>
+            </listitem>
+
+            <listitem>
+              <para><productname>Amazon Cloud Drive</productname></para>
+            </listitem>
+          </itemizedlist></td>
+      </tr>
+    </informaltable>
+  </figure>
+
+  <figure xml:id="cloud_fig_serverSoftware">
+    <title>Selected self hosting products</title>
+
+    <itemizedlist>
+      <listitem>
+        <para><productname
+        xlink:href="https://nextcloud.com">Nextcloud</productname>,
+        <productname
+        xlink:href="https://owncloud.org">Owncloud</productname></para>
+      </listitem>
+
+      <listitem>
+        <para><productname
+        xlink:href="https://www.seafile.com">Seafile</productname></para>
+      </listitem>
+
+      <listitem>
+        <para><productname
+        xlink:href="https://cozy.io">Cozy</productname></para>
       </listitem>
 
       <listitem>
-        <para>Distributed system.</para>
+        <para><productname
+        xlink:href="https://www.resilio.com">Resilio</productname></para>
       </listitem>
     </itemizedlist>
   </figure>
 
+  <figure xml:id="cloud_fig_nextcloud">
+    <title><productname
+    xlink:href="https://nextcloud.com">Nextcloud</productname>
+    features</title>
+
+    <informaltable border="0">
+      <tr>
+        <td valign="top"><itemizedlist>
+            <listitem>
+              <para>Open source (<xref linkend="glo_PHP"/>)</para>
+            </listitem>
+
+            <listitem>
+              <para><link
+              xlink:href="https://nextcloud.com/install/#install-clients">Sync
+              clients</link></para>
+            </listitem>
+
+            <listitem>
+              <para><link
+              xlink:href="https://nextcloud.com/endtoend">End-to-end
+              encryption support</link></para>
+            </listitem>
+
+            <listitem>
+              <para>Full text search</para>
+            </listitem>
+          </itemizedlist></td>
+
+        <td valign="top"><itemizedlist>
+            <listitem>
+              <para><link xlink:href="https://apps.nextcloud.com/">Plugin
+              extendability</link></para>
+
+              <itemizedlist>
+                <listitem>
+                  <para><link
+                  xlink:href="https://en.wikipedia.org/wiki/CardDAV">CardDav</link></para>
+                </listitem>
+
+                <listitem>
+                  <para><link
+                  xlink:href="https://en.wikipedia.org/wiki/CalDAV">CalDav</link></para>
+                </listitem>
+              </itemizedlist>
+            </listitem>
+
+            <listitem>
+              <para><xref linkend="glo_LDAP"/> support</para>
+            </listitem>
+          </itemizedlist></td>
+      </tr>
+    </informaltable>
+  </figure>
+
+  <figure xml:id="cloud_fig_nextcloudLighning">
+    <title><productname>Lightning</productname> integration</title>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="Ref/Cloud/lightning.png"/>
+      </imageobject>
+    </mediaobject>
+  </figure>
+
   <section xml:id="sdi_cloud_exercises_sect">
     <title>Exercises</title>