diff --git a/Changelog b/Changelog
index 1e6874a24177a4bb7f5111d253b2bf85542c563e..b1755d3047a392ff611655108f2fa63aae60b450 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,19 @@
+Changelog for ELPA 2017.05.002
+
+Mainly bugfixes for ELPA 2017.05.001:
+- fix memory leak of MPI communicators
+- tests for hermitian_multiply, cholesky decomposition and
+- deal with a problem on Debian (mawk)
+
+Changelog for ELPA 2017.05.001
+
+Final release of ELPA 2017.05.001
+Since rc2 the following changes have been made
+- more extensive tests during "make check"
+- distribute missing C headers
+- introduce analytic tests
+- Fix stack overflow in some kernels
+
 Changelog for ELPA 2017.05.001.rc2
 
 This is the release candidate 2 for the ELPA 2017.05.001 version.
diff --git a/DEPRECATED_FEATURES.md b/DEPRECATED_FEATURES.md
index 403d3dfb4ba969c310b9da81f13a71f609d10065..50a9f78bcba882f8f6ac4e6d010ed7f4bf923d69 100644
--- a/DEPRECATED_FEATURES.md
+++ b/DEPRECATED_FEATURES.md
@@ -6,7 +6,7 @@ in the (near) future from the *ELPA* library.
 
 ### A) Deprecated interfaces:###
 
-With the release of ELPA 2017.05.001.rc1 a new, more general API for the library has
+With the release of ELPA 2017.05.001 a new, more general API for the library has
 been published. All new features of ELPA will only be accesible via this new interface.
 For ease of transion, the API as defined in release ELPA 2016.11.001 has been frozen in
 and will be still supported for some time, albeit without any new features.
diff --git a/INSTALL.md b/INSTALL.md
index 1377b95efa581198cf95091d473ee617c802fe3f..dc870464f767ecb48906a508d15ebe53901cba55 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -2,7 +2,7 @@
 
 ## Preamle ##
 
-This file provides documentation on how to build the *ELPA* library in **version ELPA-2017.05.001**.
+This file provides documentation on how to build the *ELPA* library in **version ELPA-2017.05.002**.
 With release of **version ELPA-2017.05.001** the build process has been significantly simplified,
 which makes it easier to install the *ELPA* library
 
diff --git a/ISSUES.md b/ISSUES.md
index b4ef0a09bdcb491bb6e3409c8a3e33d8a46b266c..bdfea619addaeb0de71ac8474a2561f11ec4a912 100644
--- a/ISSUES.md
+++ b/ISSUES.md
@@ -6,6 +6,9 @@ Issues which are not mentioned in a newer release are (considered as) solved
 ### ELPA 2017.05.001 release ###
 - at the moment no issues are known
 
+### ELPA 2017.05.001 release ###
+- accidently a memory leak has been introduced
+
 ### ELPA 2017.05.001.rc2 release ###
 - compilation with Intel Compiler 2018 beta does not work
   (see https://gitlab.mpcdf.mpg.de/elpa/elpa/issues/54)
diff --git a/LIBRARY_INTERFACE b/LIBRARY_INTERFACE
index 66c98447d972660231f40d3e6b28c9ee7526aa69..15ce3be43235be4bdcf679b638998c56be36b10d 100644
--- a/LIBRARY_INTERFACE
+++ b/LIBRARY_INTERFACE
@@ -67,4 +67,9 @@ https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
   However, a new, more general API has been published, which will in the long run
   completely replace the "legacy" interface.
 
-  The state of release 2017.05.001.rc1 defines this interface
+  The state of release 2017.05.001 defines this interface
+
+- 10
+  NO incompatible API changes w.r.t. to the previous version. Only some functions have
+  been added. The state of release 2017.05.001 defines this interface
+
diff --git a/README.md b/README.md
index 3d948843337e8d79d1d38d6ac6b1b9af445af4f3..c906baa23f535edb398886ed8c771b25667a832b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ## Current Release ##
 
-The current release is ELPA 2017.05.001. The current supported API version
+The current release is ELPA 2017.05.002. The current supported API version
 is 20170403. This release supports the earliest API version 20170403.
 
 ## About *ELPA*
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 06490d4eac097411e50b798df3f96207dc7128cc..5c97fe6455864ac63d9571e81c2981c049f0970a 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,4 +1,4 @@
-This file contains the release notes for the ELPA 2017.05.001.rc1 version
+This file contains the release notes for the ELPA 2017.05.002 version
 
 What is new?
 -------------
diff --git a/SWITCHING_TO_NEW_INTERFACE.md b/SWITCHING_TO_NEW_INTERFACE.md
index b5eac422547806aaebfdd4ce49ca6d2ef44ce82e..7f8f2794e9abb9ff4f37b37bdf14a0424d2ba24e 100644
--- a/SWITCHING_TO_NEW_INTERFACE.md
+++ b/SWITCHING_TO_NEW_INTERFACE.md
@@ -151,7 +151,7 @@ Local documentation (via man pages) should be available (if *ELPA* has been inst
 For example "man elpa2_print_kernels" should provide the documentation for the *ELPA* program which prints all
 the available kernels.
 
-Also a [online doxygen documentation] (http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2017.05.001/html/index.html)
+Also a [online doxygen documentation] (http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2017.05.002/html/index.html)
 for each *ELPA* release is available.
 
 
diff --git a/USERS_GUIDE.md b/USERS_GUIDE.md
index 92ab88b759906dc757e99c7bb36a3e39df6b092d..a13b1f353bc81d82d3c545e56e17b014c37dc85e 100644
--- a/USERS_GUIDE.md
+++ b/USERS_GUIDE.md
@@ -9,14 +9,13 @@ Local documentation (via man pages) should be available (if *ELPA* has been inst
 For example "man elpa2_print_kernels" should provide the documentation for the *ELPA* program which prints all
 the available kernels.
 
-Also a [online doxygen documentation] (http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2017.05.001/html/index.html)
+Also a [online doxygen documentation] (http://elpa.mpcdf.mpg.de/html/Documentation/ELPA-2017.05.002/html/index.html)
 for each *ELPA* release is available.
 
 
 ## API of the *ELPA* library ##
 
-With release 2017.05.001.rc1 of the *ELPA* library the interface has been rewritten substantially, in order to have a more
-generic interface and to avoid future interface changes.
+With release 2017.05.001 of the *ELPA* library the interface has been rewritten substantially, in order to have a more generic interface and to avoid future interface changes.
 
 For compatibility reasons the interface defined in the previous release 2016.11.001 is also still available
 IF AND ONLY IF *ELPA* has been build with support of this legacy interface.
@@ -24,7 +23,7 @@ IF AND ONLY IF *ELPA* has been build with support of this legacy interface.
 If you want to use the legacy interface, please look to section "B) Using the legacy API of the *ELPA* library.
 
 The legacy API defines all the functionallity as it has been defined in *ELPA* release 2016.11.011. Note, however,
-that all future features of *ELPA* will only be accessible via the new API defined in release 2017.05.001.rc1 or later.
+that all future features of *ELPA* will only be accessible via the new API defined in release 2017.05.001 or later.
 
 ## A) Using the final API definition of the *ELPA* library ##
 
diff --git a/configure.ac b/configure.ac
index 361ae5336ea6716a4a02b3bf2fc45b7f48348094..69f44601261dd11902b9c2b82466dd6caa7b6220 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1035,10 +1035,8 @@ m4_foreach_w([elpa_m4_kind],[real complex],[
 
 #echo " "
 #echo "***********************************************************************"
-#echo "*  This is a the release candidate  ELPA 2017.05.001.rc2              *"
-#echo "*  All functionality of the release ELPA 2017.05.001 is already there.*"
-#echo "*  This release candidate reflects, except for maybe smaller bug      *"
-#echo "*  corrections, the release of ELPA 2017.05.001                       *"
+#echo "*  This is a the release of ELPA 2017.05.002                          *"
+#echo "*  It mainly contains bugfixes to ELPA 2017.05.001                    *"
 #echo "***********************************************************************"
 #echo " "
 make -f $srcdir/generated_headers.am generated-headers top_srcdir="$srcdir"