diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51c0ae4acaf074f411f0cfa82735da740eeef38f..c6ae4f6e51ccf48b4a9332faeea478c75770ee22 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -994,6 +994,7 @@ test_project:
     - ../autogen.sh
     - ../configure PKG_CONFIG_PATH=../../build/installdest/lib/pkgconfig FC=mpif90
     - make -j 8
+    - export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
     - ./test_real
     - make distclean
     - popd
diff --git a/LIBRARY_INTERFACE b/LIBRARY_INTERFACE
index 906f3ba0f45e17ea32bff0449a7715762fc82c79..ce720e8fa2c4721b36fb3eb0d97421c1cc46a2fc 100644
--- a/LIBRARY_INTERFACE
+++ b/LIBRARY_INTERFACE
@@ -31,7 +31,12 @@ https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
   Some interface need an extra argument, specifying the number of matrix columns
   (see the documentation)
 
+  The state of release 2015.11.001 defines this interface
+
 - 5
   Compatible API change w.r.t. previous version: Interfaces have been added to unify
   the naming conventions. The old interface are still available
 
+  The state of release 2015.11.001 defines this interface
+
+
diff --git a/README.md b/README.md
index 44aa72cead2fa0da36bd3e3c95560e68eed8de29..9a4654099b76b2d887cbcd189617b6841b213888 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ the possible configure options.
 ## Using *ELPA*
 
 Please have a look at the "**USERS_GUIDE**" file, to get a documentation or at the [online]
-(http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2015.11.001/html/index.html) doygen
+(http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2016.05.001/html/index.html) doygen
 documentation, where you find the definition of the interfaces.
 
 ## Contributing to *ELPA*
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index a3da567309ad0941631b32647cf76dbeb0a03e54..14e256e0637174ae18161531efcd7e3514989c2e 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,32 +1,26 @@
-This file contains the release notes for the ELPA 2015.11.001 version
-
-
+This file contains the release notes for the ELPA 2016.05.001 version
 
 What is new?
 -------------
+For changes since release ELPA 2015.11.011 please have a loog at the Changelog file
+
 
 a) ABI change
 ---------------------
 
-Most importantly, the ABI of the ELPA libray changed!
-A rebuild/relink of the user code using the ELPA library is mandatory!
-Hopefully, this will be the last ABI change for some time.
-
-b) C interface
-----------------------
+Most importantly, the ABI of the ELPA library changed!
+New interfaces have been added, the old ones still exists, thus a rebuild
+of your code (build with ELPA 2015.11.001) should not be necessary. However,
+it is not guaranteed whether your Fortran compiler produces compatible
+Fortran modules if content is added to this modules. To be on the safe sight,
+re-compiling your application with the new ELPA version is not a bad idea.
 
-ELPA now is shipped with a C interface to directly call the ELPA library (written in Fortran)
-from C code. Header files are provided to declare the c functions.
-Since ELPA is still a Fortran library it might be necessary to link it together with the needed
-Fortran runtime libraries in your C code.
+For details of the ABI changes (including the history of changes) please have a
+look at the "LIBRARY_INTERFACE" file
 
-
-
-Any incompatibles to previous version?
+Any incompatibilities to previous version?
 ---------------------------------------
 
-As mentioned before, the ABI of ELPA has changed! It will be necessary
-to rebuild the programs using ELPA, if this new version should be used.
-Beware, using the new library with code which was build with an older verion
-should not even run. If it does, the results will be wrong !
-
+As mentioned before, the ABI of ELPA was changed such, that there should be no
+incompatibility with the previous version ELPA 2015.11.001. There is an
+incompatibility with older versions than ELPA 2015.11.001 !
diff --git a/USERS_GUIDE.md b/USERS_GUIDE.md
index 6461d438eacc1510d12bff0b5b36b903078ce38c..f243a991d5b9a72a2ea6795a5a5f561dff54d5a1 100644
--- a/USERS_GUIDE.md
+++ b/USERS_GUIDE.md
@@ -9,7 +9,7 @@ Local documentation (via man pages) should be available (if *ELPA* has been inst
 For example "man get_elpa_communicators" should provide the documentation for the *ELPA* function which sets
 the necessary communicators.
 
-Also a [online doxygen documentation] (http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2015.11.001/html/index.html)
+Also a [online doxygen documentation] (http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2016.05.001/html/index.html)
 for each *ELPA* release is available.
 
 ### General concept of the  *ELPA* library ###
@@ -20,7 +20,7 @@ The *ELPA* library consists of two main parts:
 
 Both variants of the *ELPA* solvers are available for real or complex valued matrices.
 
-Thus *ELPA* provides the following user functions (see man pages or [online] (http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2015.11.001/html/index.html) for details):
+Thus *ELPA* provides the following user functions (see man pages or [online] (http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2016.05.001/html/index.html) for details):
 
 - get_elpa_communicators   : set the row / column communicators for *ELPA*
 - solve_evp_complex_1stage : solve a complex valued eigenvale proplem with the *ELPA 1stage* solver