diff --git a/docs.it4i/anselm/software/paraview.md b/docs.it4i/anselm/software/paraview.md
index 0fbd7af21a22517171a4046693624cf6b558adcc..830ce72a26c0e6a22683534e12444392040c1a58 100644
--- a/docs.it4i/anselm/software/paraview.md
+++ b/docs.it4i/anselm/software/paraview.md
@@ -12,11 +12,14 @@ Homepage : <http://www.paraview.org/>
 
 ## Installed Version
 
-Currently, version 4.0.1 compiled with GCC 4.8.1 against Bull MPI library and OSMesa 10.0 is installed on Anselm.
+Currently, version 5.1.2 compiled with intel/2017a against intel MPI library and OSMesa 12.0.2 is installed on Anselm.
 
 ## Usage
 
-On Anselm, ParaView is to be used in client-server mode. A parallel ParaView server is launched on compute nodes by the user, and client is launched on your desktop PC to control and view the visualization. Download ParaView client application for your OS here: <http://paraview.org/paraview/resources/software.php>. Important : **your version must match the version number installed on Anselm** ! (currently v4.0.1)
+On Anselm, ParaView is to be used in client-server mode. A parallel ParaView server is launched on compute nodes by the user, and client is launched on your desktop PC to control and view the visualization. Download ParaView client application for your OS here: <http://paraview.org/paraview/resources/software.php>. 
+
+!!!Warning
+    Your version must match the version number installed on Anselm.
 
 ### Launching Server
 
@@ -31,7 +34,7 @@ to launch an interactive session on 2 nodes. Refer to [Resource Allocation and J
 After the interactive session is opened, load the ParaView module :
 
 ```console
-$ module add paraview
+$ ml ParaView/5.1.2-intel-2017a-mpi
 ```
 
 Now launch the parallel server, with number of nodes times 16 processes:
@@ -50,19 +53,22 @@ Note the that the server is listening on compute node cn77 in this case, we shal
 Because a direct connection is not allowed to compute nodes on Anselm, you must establish a SSH tunnel to connect to the server. Choose a port number on your PC to be forwarded to ParaView server, for example 12345. If your PC is running Linux, use this command to establish a SSH tunnel:
 
 ```console
-ssh -TN -L 12345:cn77:11111 username@anselm.it4i.cz
+$ ssh -TN -L 12345:cn77:11111 username@anselm.it4i.cz
 ```
 
-replace username with your login and cn77 with the name of compute node your ParaView server is running on (see previous step). If you use PuTTY on Windows, load Anselm connection configuration, t>hen go to Connection-> SSH>->Tunnels to set up the port forwarding. Click Remote radio button. Insert 12345 to Source port textbox. Insert cn77:11111. Click Add button, then Open.
+replace username with your login and cn77 with the name of compute node your ParaView server is running on (see previous step). 
+
+If you use PuTTY on Windows, load Anselm connection configuration, then go to *Connection* -> *SSH* -> *Tunnels* to set up the port forwarding.
+
+Fill the Source port and Destination fields. **Do not forget to click the Add button.**
+
+![](../../img/paraview_ssh_tunnel.png "SSH Tunnel in PuTTY")
 
-Now launch ParaView client installed on your desktop PC. Select File->Connect..., click Add Server. Fill in the following :
+Now launch ParaView client installed on your desktop PC. Select *File* -> *Connect*... and fill in the following :
 
-Name : Anselm tunnel
-Server Type : Client/Server
-Host : localhost
-Port : 12345
+![](../../img/paraview_connect.png "ParaView - Connect to server")
 
-Click Configure, Save, the configuration is now saved for later use. Now click Connect to connect to the ParaView server. In your terminal where you have interactive session with ParaView server launched, you should see:
+The configuration is now saved for later use. Now click Connect to connect to the ParaView server. In your terminal where you have interactive session with ParaView server launched, you should see:
 
 ```console
 Client connected.
diff --git a/docs.it4i/img/paraview_connect.png b/docs.it4i/img/paraview_connect.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f05b6a7be747b08d867b594e8e4fe31331e3a91
Binary files /dev/null and b/docs.it4i/img/paraview_connect.png differ
diff --git a/docs.it4i/img/paraview_connect_salomon.png b/docs.it4i/img/paraview_connect_salomon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e6b6f4e0749ced81826502ea37f3a75834e351a
Binary files /dev/null and b/docs.it4i/img/paraview_connect_salomon.png differ
diff --git a/docs.it4i/img/paraview_ssh_tunnel.png b/docs.it4i/img/paraview_ssh_tunnel.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4e75f0bcb8abc00e1b5d9f42edd4f0e53d8d416
Binary files /dev/null and b/docs.it4i/img/paraview_ssh_tunnel.png differ
diff --git a/docs.it4i/img/paraview_ssh_tunnel_salomon.png b/docs.it4i/img/paraview_ssh_tunnel_salomon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6dc810ed754e19c38380b01e57c2dd886e79b78
Binary files /dev/null and b/docs.it4i/img/paraview_ssh_tunnel_salomon.png differ
diff --git a/docs.it4i/salomon/software/paraview.md b/docs.it4i/salomon/software/paraview.md
new file mode 100644
index 0000000000000000000000000000000000000000..ce52d69cfa423588bc43361249a19261197e34e5
--- /dev/null
+++ b/docs.it4i/salomon/software/paraview.md
@@ -0,0 +1,81 @@
+# ParaView
+
+Open-Source, Multi-Platform Data Analysis and Visualization Application
+
+## Introduction
+
+**ParaView** is an open-source, multi-platform data analysis and visualization application. ParaView users can quickly build visualizations to analyze their data using qualitative and quantitative techniques. The data exploration can be done interactively in 3D or programmatically using ParaView's batch processing capabilities.
+
+ParaView was developed to analyze extremely large datasets using distributed memory computing resources. It can be run on supercomputers to analyze datasets of exascale size as well as on laptops for smaller data.
+
+Homepage : <http://www.paraview.org/>
+
+## Installed Version
+
+Currently, version 5.1.2 compiled with intel/2017a against intel MPI library and OSMesa 12.0.2 is installed on Salomon.
+
+## Usage
+
+On Salomon, ParaView is to be used in client-server mode. A parallel ParaView server is launched on compute nodes by the user, and client is launched on your desktop PC to control and view the visualization. Download ParaView client application for your OS here: <http://paraview.org/paraview/resources/software.php>.
+
+!!!Warning
+    Your version must match the version number installed on Salomon.
+
+### Launching Server
+
+To launch the server, you must first allocate compute nodes, for example
+
+```console
+$ qsub -I -q qprod -A OPEN-0-0 -l select=2
+```
+
+to launch an interactive session on 2 nodes. Refer to [Resource Allocation and Job Execution](../job-submission-and-execution/) for details.
+
+After the interactive session is opened, load the ParaView module :
+
+```console
+$ ml ParaView/5.1.2-intel-2017a-mpi
+```
+
+Now launch the parallel server, with number of nodes times 24 processes:
+
+```console
+$ mpirun -np 48 pvserver --use-offscreen-rendering
+    Waiting for client...
+    Connection URL: cs://r37u29n1006:11111
+    Accepting connection(s): r37u29n1006:11111
+```
+
+Note the that the server is listening on compute node r37u29n1006 in this case, we shall use this information later.
+
+### Client Connection
+
+Because a direct connection is not allowed to compute nodes on Salomon, you must establish a SSH tunnel to connect to the server. Choose a port number on your PC to be forwarded to ParaView server, for example 12345. If your PC is running Linux, use this command to establish a SSH tunnel:
+
+```console
+$ ssh -TN -L 12345:r37u29n1006:11111 username@salomon.it4i.cz
+```
+
+replace username with your login and r37u29n1006 with the name of compute node your ParaView server is running on (see previous step). 
+
+If you use PuTTY on Windows, load Salomon connection configuration, then go to *Connection* -> *SSH* -> *Tunnels* to set up the port forwarding.
+
+Fill the Source port and Destination fields. **Do not forget to click the Add button.**
+
+![](../../img/paraview_ssh_tunnel_salomon.png "SSH Tunnel in PuTTY")
+
+Now launch ParaView client installed on your desktop PC. Select *File* -> *Connect...* and fill in the following :
+
+![](../../img/paraview_connect_salomon.png "ParaView - Connect to server")
+
+The configuration is now saved for later use. Now click Connect to connect to the ParaView server. In your terminal where you have interactive session with ParaView server launched, you should see:
+
+```console
+Client connected.
+```
+
+You can now use Parallel ParaView.
+
+### Close Server
+
+Remember to close the interactive session after you finish working with ParaView server, as it will remain launched even after your client is disconnected and will continue to consume resources.
diff --git a/mkdocs.yml b/mkdocs.yml
index f8ddd8a6fc2cfcdf60b4b980f2745011b9c36c67..6343f24ef87fba59fb68a03e7cc1314f34973122 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -119,6 +119,7 @@ pages:
         - Octave: salomon/software/numerical-languages/octave.md
         - R: salomon/software/numerical-languages/r.md
       - Operating System: salomon/software/operating-system.md
+      - ParaView: salomon/software/paraview.md
     - Anselm Software:
       - Available Modules: modules-anselm.md
       - 'ANSYS':