diff --git a/salomon.csv b/salomon.csv
index 4bf731d4fb723559588c9f24162bee8bd8afe9e8..364ec46b94830214e3f0e3f146cc0189320059c2 100644
--- a/salomon.csv
+++ b/salomon.csv
@@ -867,7 +867,6 @@ lxml/3.4.4-intel-2015b-Python-2.7.9,2
 lxml/3.8.0-Python-2.7.13-base,2
 mpi4py/2.0.0-intel-2017a-Python-2.7.13-base,2
 mpi4py/3.0.0-foss-2017a-Python-2.7.13,2
-nettle/3.2-intel-2017a,2
 nettle/3.3-foss-2017a,2
 nettle/3.3-intel-2017a,2
 pylint/1.7.2-Python-2.7.13-base,2
diff --git a/salomon.md b/salomon.md
index c30861c7e25c7c339b4fe36408b09da582321fac..3e4f62d67993b8316f63bfba87d580880d63e041 100644
--- a/salomon.md
+++ b/salomon.md
@@ -221,13 +221,13 @@
 | [libunwind](http://www.nongnu.org/libunwind/) | The primary goal of libunwind is to define a portable and efficient C programming interface (API) to determine the call-chain of a program. The API additionally provides the means to manipulate the preserved (callee-saved) state of each call-frame and to resume execution at any point in the call-chain (non-local goto). The API supports both local (same-process) and remote (across-process) operation. As such, the API is useful in a number of applications |
 | [libxcb](http://xcb.freedesktop.org/) | The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility. |
 | [libxml2](http://xmlsoft.org/) | Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable outside of the Gnome platform). |
-| libxslt |   |
-| libyaml |   |
+| [libxslt](http://xmlsoft.org/) | Libxslt is the XSLT C library developed for the GNOME project (but usable outside of the Gnome platform). |
+| [libyaml](http://pyyaml.org/wiki/LibYAML) | LibYAML is a YAML 1.1 parser and emitter written in C. |
 | [libzip](https://nih.at/libzip/) | libzip is a C library for reading, creating, and modifying zip archives. Files can be added from data buffers, files, or compressed data copied directly from other zip archives. Changes made without closing the archive can be reverted. The API is documented by man pages. |
 | [lxml](http://lxml.de/) | The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt. |
-| MATIO |   |
+| [MATIO](http://sourceforge.net/projects/matio/) | matio is an C library for reading and writing Matlab MAT files. |
 | [mpi4py](https://bitbucket.org/mpi4py/mpi4py) | MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for the Python programming language, allowing any Python program to exploit multiple processors. |
-| nettle |   |
+| [nettle](http://www.lysator.liu.se/~nisse/nettle/) | Nettle is a cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space. |
 | [OpenCoarrays](http://www.opencoarrays.org) | OpenCoarrays is an open-source software project for developing, porting and tuning transport layers that support coarray Fortran compilers. |
 | [PROJ](http://trac.osgeo.org/proj/) | Program proj is a standard Unix filter function which converts geographic longitude and latitude coordinates into cartesian coordinates |
 | [pylint](https://github.com/PyCQA/pylint) | Pylint is a Python source code analyzer which looks for programming errors, helps enforcing a coding standard and sniffs for some code smells (as defined in Martin Fowler's Refactoring book). |
diff --git a/uv2000.csv b/uv2000.csv
index eaf807f35c6fca1c96d3f61364c2fea21ba18f14..0bfeae7b15c7c04717fb210fe7b4320885c1576a 100644
--- a/uv2000.csv
+++ b/uv2000.csv
@@ -122,7 +122,6 @@ libsndfile/1.0.28-intel-2017a,3
 libxml2/2.9.2-foss-2015b,3
 libxml2/2.9.4-Python-2.7.13,3
 libxml2/2.9.4,3
-nettle/3.2-intel-2017a,3
 nettle/3.3-intel-2017a,3
 tbb/4.4.2.152,3
 zlib/1.2.7-intel-2015b,3