diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index fe7125b5..d4fe1ae4 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -1,7 +1,4 @@
 Write cdist-best-practise:
    - Multi master setups
-   - ssh with master socket?
-      - saves connection delay for new connections: -M
-      - hint: http://protempore.net/~calvins/howto/ssh-connection-sharing/
    - Different environments (production, integration, development)
       - via version control
diff --git a/doc/man/cdist-best-practise.text b/doc/man/cdist-best-practise.text
index 159da51d..4d4b8edb 100644
--- a/doc/man/cdist-best-practise.text
+++ b/doc/man/cdist-best-practise.text
@@ -1,4 +1,4 @@
-cdist-best-practise(1)
+cdist-best-practise(7)
 ======================
 Nico Schottelius <nico-cdist--@--schottelius.org>
 
@@ -7,8 +7,28 @@ NAME
 cdist-best-practise - Practises used in real environments
 
 
-TOPIC1
-------
+PASSWORDLESS CONNECTIONS
+------------------------
+It is recommended to run cdist with public key authentication.
+This requires a private/public key pair and the entry
+"PermitRootLogin without-password" in the sshd server.
+See sshd_config(5) and ssh-keygen(1).
+
+
+SPEEDING UP SSH CONNECTIONS
+---------------------------
+When connecting to a new host, the initial delay with ssh connections
+is pretty big. You can work around this by
+"sharing of multiple sessions over a single network connection"
+(quote from ssh_config(5)). The following code is suitable for
+inclusion into your ~/.ssh/config:
+
+--------------------------------------------------------------------------------
+Host *
+  ControlPath ~/.ssh/master-%l-%r@%h:%p
+  ControlMaster auto
+  ControlPersist 10
+--------------------------------------------------------------------------------
 
 
 
diff --git a/doc/man/cdist.text b/doc/man/cdist.text
index 570b6b95..957e7cb4 100644
--- a/doc/man/cdist.text
+++ b/doc/man/cdist.text
@@ -30,6 +30,7 @@ pull mechanism (client requests configuration).
 SEE ALSO
 --------
 - Website: http://www.nico.schottelius.org/cdist/[]
+- cdist-best-practise(7)
 - cdist-deploy-to(1)
 - cdist-manifest(7)
 - cdist-quickstart(1)