diff --git a/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm1_download.png b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm1_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..4113a5de81c01b08a35491c82c8395090dd88e62
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm1_download.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm2_first.png b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm2_first.png
new file mode 100644
index 0000000000000000000000000000000000000000..3404cd8a9d42d57aa6c17ca0a819bade2d28a4be
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm2_first.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm3_config.png b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm3_config.png
new file mode 100644
index 0000000000000000000000000000000000000000..bad9e427ddd5e123ce1b61872e439056d248e5dc
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm3_config.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm4_session.png b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm4_session.png
new file mode 100644
index 0000000000000000000000000000000000000000..4306f3c4cd056c2918e47107ab32ec41a3315137
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm4_session.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm5_ssh.png b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm5_ssh.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ad0a450326b7fb711e2964826f12a5de3dfe460
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm5_ssh.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm6_oldse.png b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm6_oldse.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b1f5cf4adfdb9f8559939266592821a411cd623
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm6_oldse.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm7_pw.png b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm7_pw.png
new file mode 100644
index 0000000000000000000000000000000000000000..67a931924781165700e474c438b1ad7d76b36f3c
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/mobaxterm7_pw.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/putty1_download.png b/doc.zih.tu-dresden.de/docs/access/misc/putty1_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..c49b3e04993c98e9e0ef2db973520cb3d477e081
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/putty1_download.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/putty2_quickstart.png b/doc.zih.tu-dresden.de/docs/access/misc/putty2_quickstart.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2b9787e0d11d5c199f8650eb10c984b0f53c520
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/putty2_quickstart.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/putty3_login.png b/doc.zih.tu-dresden.de/docs/access/misc/putty3_login.png
new file mode 100644
index 0000000000000000000000000000000000000000..c362438220fab7d5aca5cd7603d27c9f69fed076
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/putty3_login.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/putty4_username.png b/doc.zih.tu-dresden.de/docs/access/misc/putty4_username.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e722e1c2e4fc1ecb6be600c67107eabf729716d
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/putty4_username.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/putty5_key.png b/doc.zih.tu-dresden.de/docs/access/misc/putty5_key.png
new file mode 100644
index 0000000000000000000000000000000000000000..09e3931b178242f39c1f5a35f058581aca925775
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/putty5_key.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/putty6_x11.png b/doc.zih.tu-dresden.de/docs/access/misc/putty6_x11.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2507777d61ae05503a7c7b184609882d5b8fe5f
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/putty6_x11.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/putty7_save.png b/doc.zih.tu-dresden.de/docs/access/misc/putty7_save.png
new file mode 100644
index 0000000000000000000000000000000000000000..7feec9dd5a1291dbe42add5281ba65c321fa1825
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/putty7_save.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/misc/putty8_gen_key.png b/doc.zih.tu-dresden.de/docs/access/misc/putty8_gen_key.png
new file mode 100644
index 0000000000000000000000000000000000000000..70960f9d154a46d438b0fb52c44d1adcc2e6ee41
Binary files /dev/null and b/doc.zih.tu-dresden.de/docs/access/misc/putty8_gen_key.png differ
diff --git a/doc.zih.tu-dresden.de/docs/access/overview.md b/doc.zih.tu-dresden.de/docs/access/overview.md
index 3600d8e69a05ad98201c161371164eda8d61cf41..b8631be6ba77a47d8c712981f6274b57d47d3497 100644
--- a/doc.zih.tu-dresden.de/docs/access/overview.md
+++ b/doc.zih.tu-dresden.de/docs/access/overview.md
@@ -16,3 +16,15 @@ There are several different ways to access ZIH systems depending on the intended
     Prerequisite for accessing ZIH systems is a HPC project and a login. Please refer to the pages
     within [Application for Login and Resources](../application/overview.md) for detailed
     information.
+
+For security reasons, ZIH systems are only accessible for hosts within the domains of TU Dresden.
+
+To access the ZIH systems from outside the campus networks it is recommended to set up a Virtual
+Private Network (VPN) connection to enter the campus network. While active, it allows the user
+to connect directly to the HPC login nodes.
+
+For more information on our VPN and how to set it up, please visit the corresponding
+[ZIH service catalog page](https://tu-dresden.de/zih/dienste/service-katalog/arbeitsumgebung/zugang_datennetz/vpn).
+
+The page [key fingerprints](key_fingerprints.md) holds the up-to-date fingerprints for the login
+nodes. Make sure they match.
diff --git a/doc.zih.tu-dresden.de/docs/access/ssh_login.md b/doc.zih.tu-dresden.de/docs/access/ssh_login.md
index a0fef440151984abbe662fe8f096de166eae6dad..0043fff8777604ad96c885a48c8c355c261d9e4d 100644
--- a/doc.zih.tu-dresden.de/docs/access/ssh_login.md
+++ b/doc.zih.tu-dresden.de/docs/access/ssh_login.md
@@ -1,30 +1,18 @@
-# Connecting with SSH
+# Connecting via terminal
 
-For security reasons, ZIH systems are only accessible for hosts within the domains of TU Dresden.
+Connecting via terminal works on every operating system. For Linux and Macintosh operating systems
+no additional software is required. For users of a Windows OS a recent version of Windows is
+required (Windows 10, Build 1809 and higher). It is possible to use
+[Command Prompt](https://en.wikipedia.org/wiki/Cmd.exe) or [PowerShell](https://en.wikipedia.org/wiki/PowerShell)).
+Ensure that [OpenSSH](https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/factoryos/connect-using-ssh?view=windows-10)
+is installed on the system.
 
-## Virtual Private Network (VPN)
+SSH establishes secure connections using authentication and encryption. The login nodes accept
+the following encryption algorithms: `aes128-ctr`, `aes192-ctr`, `aes256-ctr`,
+`aes128-gcm@openssh.com`, `aes256-gcm@openssh.com`, `chacha20-poly1305@openssh.com`,
+`chacha20-poly1305@openssh.com`.
 
-To access the ZIH systems from outside the campus networks it's recommended to set up a VPN
-connection to enter the campus network. While active, it allows the user to connect directly to the
-HPC login nodes.
-
-For more information on our VPN and how to set it up, please visit the corresponding
-[ZIH service catalog page](https://tu-dresden.de/zih/dienste/service-katalog/arbeitsumgebung/zugang_datennetz/vpn).
-
-## Connecting from Linux
-
-SSH establishes secure connections using authentication and encryption. Thus, please use an
-up-to-date SSH client. The login nodes accept the following encryption algorithms:
-
-* `aes128-ctr`
-* `aes192-ctr`
-* `aes256-ctr`
-* `aes128-gcm@openssh.com`
-* `aes256-gcm@openssh.com`
-* `chacha20-poly1305@openssh.com`
-* `chacha20-poly1305@openssh.com`
-
-### Before Your First Connection
+## Before Your First Connection
 
 We suggest to create an SSH key pair before you work with the ZIH systems. This ensures high
 connection security.
@@ -71,7 +59,7 @@ they match. Then you can accept by typing `yes`.
     marie@login$ cat id_ed25519.pub >> ~/.ssh/authorized_keys
     ```
 
-#### Configuring Default Parameters for SSH
+### Configuring Default Parameters for SSH
 
 After you have copied your key to the ZIH system, you should be able to connect using:
 
@@ -119,7 +107,7 @@ marie@local$ ssh taurus
 If you want to copy data from/to ZIH systems, please refer to [Export Nodes: Transfer Data to/from
 ZIH's Filesystems](../data_transfer/export_nodes.md) for more information on export nodes.
 
-### X11-Forwarding
+## X11-Forwarding
 
 If you plan to use an application with graphical user interface (GUI), you need to enable
 X11-forwarding for the connection. If you use the SSH configuration described above, everything is
@@ -141,18 +129,3 @@ marie@local$ ssh -XC taurus
 
     Also consider to use a [DCV session](desktop_cloud_visualization.md) for remote desktop
     visualization at ZIH systems.
-
-## Connecting from Windows
-
-We recommend one of the following applications:
-
-  * [MobaXTerm](https://mobaxterm.mobatek.net): [ZIH documentation](misc/basic_usage_of_MobaXterm.pdf)
-  * [PuTTY](https://www.putty.org): [ZIH documentation](misc/basic_usage_of_PuTTY.pdf)
-  * For Windows 10 (1809 and higher):
-    * [Windows Terminal](https://www.microsoft.com/store/productId/9N0DX20HK701)
-    * Together with the built-in [OpenSSH Client](https://docs.microsoft.com/de-de/windows-server/administration/openssh/openssh_overview)
-
-## SSH Key Fingerprints
-
-The page [key fingerprints](key_fingerprints.md) holds the up-to-date fingerprints for the login
-nodes. Make sure they match.
diff --git a/doc.zih.tu-dresden.de/docs/access/ssh_mobaxterm.md b/doc.zih.tu-dresden.de/docs/access/ssh_mobaxterm.md
new file mode 100644
index 0000000000000000000000000000000000000000..791f7578956ba1848b9f8ae6650a3f93f061a849
--- /dev/null
+++ b/doc.zih.tu-dresden.de/docs/access/ssh_mobaxterm.md
@@ -0,0 +1,74 @@
+# Connecting from Windows with MobaXterm
+
+MobaXterm is an enhanced terminal for Windows with an X11 server, a tabbed SSH client, network
+tools and more.
+
+Visit its homepage for more information (https://mobaxterm.mobatek.net).
+
+## Download and install
+
+To download go to [MobaXterm homepage](https://mobaxterm.mobatek.net/download-home-edition.html)
+and download a free home edition.
+
+![Downloading MobaXterm](misc/mobaxterm1_download.png)
+
+Pick the installer suiting best your current system and run it afterwards. Follow the instructions.
+You should see the following interface after starting the MobaXterm application.
+
+![First opening MobaXterm](misc/mobaxterm2_first.png)
+
+## Configure local settings
+
+Select the menu entry "Settings" → "Configuration" or click the button "Settings" in the
+toolbar. A new window will open.
+
+![Settings in MobaXterm](misc/mobaxterm3_config.png)
+
+Here you can set different options in the following tabs:
+
+- "General" - local path options for local MobaXterm-session,
+- "Terminal" -  options, which alter your terminal, e.g. color scheme,
+- "X11" - options for X11-forwarding. It is enabled by default,
+- "SSH" - general SSH settings, e.g. keep-alive, SSH agent, browser-options,
+- "Display" - general display-options for the application,
+- "Toolbar" - customization of the toolbar,
+- "Misc" - options to alter specific actions inside the MobaXterm-application.
+
+## Start a new session
+
+1.  Select the tab "Sessions"  → "New session" or click the button "Session" in the toolbar.
+
+    ![Opening a new session in MobaXterm](misc/mobaxterm4_session.png)
+
+1.  Select a SSH section. Insert "Remote host" (`taurus.hrsk.tu-dresden.de`), "Username" (replace
+    `marie` with your ZIH login), and "Port" 22. Using the button right from the username option,
+    you can store and manage credentials.
+
+    ![Settings for SSH connection in MobaXterm](misc/mobaxterm5_ssh.png)
+
+1.  Advanced settings can be configured in the same window below. These are
+    - "Advanced SSH settings" - set defaults for this specific session. For example, set a SSH key
+    or change the remote environment,
+    - "Terminal settings" - change terminal options,
+    - "Network settings" - configure how the connection is built over the network. For example, by
+    adding a proxy as gateway to the targeted system,
+    - "Bookmark settings" - specify how the session will be saved to your session list, which is
+    afterwards accessible by the button "Sessions".
+
+1.  Start the session by clicking the button "OK".
+
+    Your previous sessions are saved in the bookmarks and can be accessed via the menu entry
+    "Sessions"  →  "User sessions". Alternatively, double click on one of the previous
+    sessions on the left panel.
+
+    ![Opening a saved session in MobaXterm](misc/mobaxterm6_oldse.png)
+
+1.  The last thing to do is to input your ZIH password in the command line and to press enter.
+    The entered symbols of your password are invisible and will not appear as typed in.
+
+    ![Saving your password in MobaXterm](misc/mobaxterm7_pw.png)
+
+!!! Caution
+
+    Do not forget to close the session after your jobs are finished. Just type `exit` in the
+    command line and complete with pressing enter.
diff --git a/doc.zih.tu-dresden.de/docs/access/ssh_putty.md b/doc.zih.tu-dresden.de/docs/access/ssh_putty.md
new file mode 100644
index 0000000000000000000000000000000000000000..f6f390868a78670d339162705ef2f79057d4ec01
--- /dev/null
+++ b/doc.zih.tu-dresden.de/docs/access/ssh_putty.md
@@ -0,0 +1,81 @@
+# Connecting from Windows with PuTTY
+
+PuTTY is a free and open-source terminal emulator, serial console and network file transfer
+application, supports several network protocols, including SCP, SSH. Visit the
+[homepage](https://www.putty.org) for more information.
+
+## Download and install
+
+Download the installer suiting best your current system and run it afterwards. Follow the
+instructions for installation.
+
+![Downloading PuTTY](misc/putty1_download.png)
+
+## Start a new SSH session
+
+1.  Start PuTTY and insert the "Host Name" (`taurus.hrsk.tu-dresden.de`) and leave the default
+    port (22).
+
+    ![Settings for SSH connection in PuTTY](misc/putty2_quickstart.png)
+
+1.  Click "Open" to start a new session. A terminal window will open up.
+
+    ![Login in PuTTY](misc/putty3_login.png)
+
+1.  After entering your ZIH login and password you will be logged in to one of the login nodes.
+
+## Connection Configuration (optional)
+
+You can pre-configure some connection details additionally. It will save time in the future.
+
+-   Set your user name. For that choose the tab "Connection" → "Data" in the navigation tree
+    on the left. Insert your ZIH username in the text field "Auto-login username".
+
+    ![Auto-login username in PuTTY](misc/putty4_username.png)
+
+-   Configure SSH-key (recommended for security reason).
+
+    ??? note "Generate your key pair"
+
+        If you do not have your SSH key pair (public and private keys) yet, you can generate
+        it using PuTTYgen program, which was installed together with the main PuTTY client.
+
+        ![PuTTY generate key pair](misc/putty8_gen_key.png){: width=400}
+
+        Click on the button "Generate" to create a new key pair. Move the mouse pointer in the
+        respective field as requested. Afterwards save your public and private keys in separate
+        files. It is recommended to use a passphrase for the private key.
+
+    To configure the SSH key to use, navigate to "Connection" → "SSH" → "Auth" in the
+    tree left. Insert the path to your local key-file in a text field "Private key file for
+    authentication" or select it with "Browse...".
+
+    ![SSH-key in PuTTY](misc/putty5_key.png)
+
+    !!! note "Add public key to ZIH system"
+
+        For being able to use a SSH key to login to ZIH system, you have to register the key
+        on the system before!
+
+        Login to the ZIH system using your password and add your public-key to
+        `~/.ssh/authorized_keys`.
+
+-   Enable X-forwarding. Navigate to "Connection" → "SSH" → "X11" in the tree on the
+    left. Select the checkbox "Enable X11 forwarding".
+
+    ![X-forwarding in PuTTY](misc/putty6_x11.png)
+
+After editing the connection details save your configuration. Go back to the "Session" in the tree
+left. Insert a session bookmark name into the text field "Saved Sessions" and click the button
+"Save". Afterwards you will see the name in the list below.
+
+![Saving settings in PuTTY](misc/putty7_save.png)
+
+Now, you can start a configured session by double-clicking its name in the list.
+
+You can change your saved configuration by selecting its name in the list and clicking the button
+"Load". Make your changes and save it again under the same name. This will overwrite the old
+configuration permanently.
+
+You can delete saved configuration by clicking the button "Delete". This will remove the
+configured session permanently.
diff --git a/doc.zih.tu-dresden.de/mkdocs.yml b/doc.zih.tu-dresden.de/mkdocs.yml
index e96b6c65ef6834b926bbf0d8cf5519fd467b859b..0879b8e67a07750a158de583d8e241d519a05539 100644
--- a/doc.zih.tu-dresden.de/mkdocs.yml
+++ b/doc.zih.tu-dresden.de/mkdocs.yml
@@ -10,7 +10,10 @@ nav:
     - Acknowledgement: application/acknowledgement.md
   - Access to ZIH Systems:
     - Overview: access/overview.md
-    - Connecting with SSH: access/ssh_login.md
+    - Connecting with SSH: 
+      - Connecting via terminal (Linux, Mac, Windows): access/ssh_login.md
+      - Connecting via MobaXterm (Windows): access/ssh_mobaxterm.md
+      - Connecting via Putty (Windows): access/ssh_putty.md
     - Desktop Cloud Visualization (DCV): access/desktop_cloud_visualization.md
     - Graphical Applications with WebVNC: access/graphical_applications_with_webvnc.md
     - JupyterHub:
diff --git a/doc.zih.tu-dresden.de/wordlist.aspell b/doc.zih.tu-dresden.de/wordlist.aspell
index 4887f0220760bf05d89a616df736c0b4a85f9d74..3cf7357830331ef9f8a5b83ec8f4986b3bcf2fd0 100644
--- a/doc.zih.tu-dresden.de/wordlist.aspell
+++ b/doc.zih.tu-dresden.de/wordlist.aspell
@@ -11,6 +11,7 @@ Analytics
 anonymized
 Ansys
 APIs
+Auth
 AVX
 awk
 BeeGFS
@@ -214,7 +215,7 @@ Miniconda
 mkdocs
 MKL
 MNIST
-MobaXTerm
+MobaXterm
 modenv
 modenvs
 modulefile
@@ -300,6 +301,7 @@ pipelining
 PMI
 png
 PowerAI
+PowerShell
 ppc
 pre
 Pre