diff --git a/uv2000.csv b/uv2000.csv
index 41569ae079c18e53d5554f2d010c4ac6ebdc69a4..b7c7fd3e45e6e5af2ee1afc9df8ebb9601b9f12a 100644
--- a/uv2000.csv
+++ b/uv2000.csv
@@ -6,5 +6,12 @@ flex/2.6.3,4
 GCC/6.3.0-2.27,4
 GCCcore/6.3.0,4
 help2man/1.47.4,4
+icc/2017.7.259-GCC-6.3.0-2.27,4
+iccifort/2017.7.259-GCC-6.3.0-2.27,4
+ifort/2017.7.259-GCC-6.3.0-2.27,4
+iimpi/2017c,4
+imkl/2017.4.239-iimpi-2017c,4
+impi/2017.4.239-iccifort-2017.7.259-GCC-6.3.0-2.27,4
+intel/2017c,4
 M4/1.4.18,4
 zlib/1.2.11,4
diff --git a/uv2000.md b/uv2000.md
index c15821a97a2fbb57cda53f8e47ded10de4ab8ca1..d6f52bb97b30a065702a60c5558e720b8ebfb73d 100644
--- a/uv2000.md
+++ b/uv2000.md
@@ -5,6 +5,8 @@
 | ------ | ----------- |
 | [GCC](http://gcc.gnu.org/) | The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada, as well as libraries for these languages (libstdc++, libgcj,...). |
 | [GCCcore](http://gcc.gnu.org/) | The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada, as well as libraries for these languages (libstdc++, libgcj,...). |
+| [icc](http://software.intel.com/en-us/intel-compilers/) | Intel C and C++ compilers |
+| [ifort](http://software.intel.com/en-us/intel-compilers/) | Intel Fortran compiler |
 
 ## Devel
 
@@ -25,6 +27,26 @@
 | ------ | ----------- |
 | [zlib](http://www.zlib.net/) | zlib is designed to be a free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library for use on virtually any computer hardware and operating system. |
 
+## Mpi
+
+| Module | Description |
+| ------ | ----------- |
+| [impi](http://software.intel.com/en-us/intel-mpi-library/) | Intel MPI Library, compatible with MPICH ABI |
+
+## Numlib
+
+| Module | Description |
+| ------ | ----------- |
+| [imkl](http://software.intel.com/en-us/intel-mkl/) | Intel Math Kernel Library is a library of highly optimized, extensively threaded math routines for science, engineering, and financial applications that require maximum performance. Core math functions include BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more. |
+
+## Toolchain
+
+| Module | Description |
+| ------ | ----------- |
+| [iccifort](http://software.intel.com/en-us/intel-cluster-toolkit-compiler/) | Intel C, C++ & Fortran compilers |
+| [iimpi](http://software.intel.com/en-us/intel-cluster-toolkit-compiler/) | Intel C/C++ and Fortran compilers, alongside Intel MPI. |
+| [intel](http://software.intel.com/en-us/intel-cluster-toolkit-compiler/) | Compiler toolchain including Intel compilers, Intel MPI and Intel Math Kernel Library (MKL). |
+
 ## Tools
 
 | Module | Description |