diff --git a/salomon.csv b/salomon.csv
index 97a8143d824d44e37c463ba72d4b188061fa6dbd..0464253bc1a78b3cfb81debaf918db418d4c8de8 100644
--- a/salomon.csv
+++ b/salomon.csv
@@ -1189,6 +1189,7 @@ phonopy/1.11.12.5-Python-2.7.13-base,2
 numpy/1.13.3-Python-3.6.2-base,2
 pyparsing/2.2.0-Python-3.6.2-base,2
 scipy/1.0.0-Python-3.6.2-base,2
+six/1.11.0-python-toolchain-3.6,2
 six/1.11.0-Python-2.7,2
 six/1.11.0-Python-3.6,2
 six/1.11.0-Python-3.6.2-base,2
@@ -1279,6 +1280,7 @@ iompi/2017a,2
 iompi/2017.01,2
 libc/2.14-6.3.0,2
 prace/20160107-intel-2016.01,2
+python-toolchain/3.6,2
 python/3.6,2
 ANSYS/16.1,2
 ANSYS/17.0,2
diff --git a/salomon.md b/salomon.md
index 75db9d781502baeea84fb7b96d8232fe185d78a1..5a0d442e05017042d269c8740181093c67ff3a17 100644
--- a/salomon.md
+++ b/salomon.md
@@ -385,6 +385,7 @@
 | [prace](http://www.prace-ri.eu/PRACE-Common-Production) | PRACE Common Production Environment (PCPE) Initialisation of the PRACE common production environment. This allows you to assume that the following tools/libraries are available by default in your PATH/environment. * Fortran, C, C++ Compilers * MPI * BLAS, LAPACK, BLACS, ScaLAPACK * FFTW * HDF5, NetCDF The compiler commands on are: * mpif90 - Fortran compiler * mpicc - C compiler * mpicxx - C++ compiler For more information on the PCPE please see the documentation at: http://www.prace-ri.eu/PRACE-Common-Production For help using this system, please see Local User Guide available at: http://prace-ri.eu/Best-Practice-Guide-Anselm-HTML |
 | [Python](http://python.org/) | Python is a programming language that lets you work more quickly and integrate your systems more effectively. |
 | [python](https://www.python.org) | Python 2.7 toolchain |
+| [python-toolchain](https://www.python.org) | Python 3.6 toolchain |
 
 ## Tools