diff --git a/docs/client-apple.md b/docs/client-apple.md
index 94d3ce0ed..1cf520432 100644
--- a/docs/client-apple.md
+++ b/docs/client-apple.md
@@ -1,9 +1,13 @@
+## Method 1 (IMAP, SMTP, DAV)
+
 Email, contacts and calendar can be configured automatically on Apple devices by installing a profile. It configure IMAP, CardDAV and CalDAV.
 
 1. Download and open <span class="client_variables_unavailable">the file from <i>https://${MAILCOW_HOSTNAME}/mobileconfig.php</i></span><span class="client_variables_available"><a class="client_var_link" href="mobileconfig.php">mailcow.mobileconfig</a></span>.
 2. Enter the unlock code (iPhone) or computer password (Mac).
 3. Enter your email password three times when prompted.
 
+## Method 2 (Exchange ActiveSync emulation)
+
 On iOS, Exchange ActiveSync is also supported as an alternative to the procedure above. It has the advantage of supporting push email (i.e. you are immediately notified of incoming messages), but has some limitations, e.g. it does not support more than three email addresses per contact in your address book. Follow the steps below if you decide to use Exchange instead.
 
 1. Open the *Settings* app, tap *Mail*, tap *Accounts*, tap *Add Acccount*, select *Exchange*.
diff --git a/docs/client-manual.md b/docs/client-manual.md
new file mode 100644
index 000000000..076dfd8a8
--- /dev/null
+++ b/docs/client-manual.md
@@ -0,0 +1,23 @@
+These instructions are valid for unchanged port bindings only!
+
+## Email
+
+|Service|Encryption|Host|Port|
+|--- |--- |--- |--- |
+|IMAP|STARTTLS|<span class="client_variables_available"> <code><span class="client_var_host"></span><span class="client_var_port"></span></code></span><span class="client_variables_unavailable">mailcow hostname</span>|143|
+|IMAPS|SSL|<span class="client_variables_available"> <code><span class="client_var_host"></span><span class="client_var_port"></span></code></span><span class="client_variables_unavailable">mailcow hostname</span>|993|
+|POP3|STARTTLS|<span class="client_variables_available"> <code><span class="client_var_host"></span><span class="client_var_port"></span></code></span><span class="client_variables_unavailable">mailcow hostname</span>|110|
+|POP3S|SSL|<span class="client_variables_available"> <code><span class="client_var_host"></span><span class="client_var_port"></span></code></span><span class="client_variables_unavailable">mailcow hostname</span>|995|
+|SMTP|STARTTLS|<span class="client_variables_available"> <code><span class="client_var_host"></span><span class="client_var_port"></span></code></span><span class="client_variables_unavailable">mailcow hostname</span>|587|
+|SMTPS|SSL|<span class="client_variables_available"> <code><span class="client_var_host"></span><span class="client_var_port"></span></code></span><span class="client_variables_unavailable">mailcow hostname</span>|465|
+
+Please use "plain" as authentication mechanisms. Contrary to the assumption no passwords will be transfered plain text, as no authentication is allowed to take place without TLS.
+
+## Contacts and calendars
+
+SOGos default calendar (CalDAV) and contacts (CardDAV) URLs:
+
+1. **CalDAV** - https://mail.example.com/SOGo/dav/user@example.com/Calendar/personal/
+2. **CardDAV** - https://mail.example.com/SOGo/dav/user@example.com/Contacts/personal/
+
+Some applications may require you to use https://mail.example.com/SOGo/dav/ _or_ the full path to your calender, which can be found and copied from within SOGo.
diff --git a/docs/client.md b/docs/client.md
index dea3cfe6b..e2a6bbfb7 100644
--- a/docs/client.md
+++ b/docs/client.md
@@ -23,3 +23,4 @@ Since you accessed this page after logging into your mailcow server, all of the
 - [Mozilla Thunderbird](client-thunderbird)
 - [Windows Mail](client-windows)
 - [Windows Phone](client-windowsphone)
+- [Manual configuration](client-manual)
diff --git a/mkdocs.yml b/mkdocs.yml
index abac7b37e..0bdda3979 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -82,6 +82,7 @@ pages:
   - 'Mozilla Thunderbird': 'client-thunderbird.md'
   - 'Windows Mail': 'client-windows.md'
   - 'Windows Phone': 'client-windowsphone.md'
+  - 'Manual configuration': 'client-manual.md'
 - 'Third party apps':
   - 'SOGo Integrator for Thunderbird': 'third_party-thunderbird.md'
   - 'Roundcube': 'third_party-roundcube.md'