diff --git a/src/aligned_mem.F90 b/src/aligned_mem.F90
index 329a989f2ad479c60c83a76fb26df756de441e14..104d9af6602130819582aa5835b50a5829365f15 100644
--- a/src/aligned_mem.F90
+++ b/src/aligned_mem.F90
@@ -1,3 +1,46 @@
+!    This file is part of ELPA.
+!
+!    The ELPA library was originally created by the ELPA consortium,
+!    consisting of the following organizations:
+!
+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
+!      Informatik,
+!    - Technische Universität München, Lehrstuhl für Informatik mit
+!      Schwerpunkt Wissenschaftliches Rechnen ,
+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaftrn,
+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
+!      and
+!    - IBM Deutschland GmbH
+!
+!
+!    More information can be found here:
+!    http://elpa.mpcdf.mpg.de/
+!
+!    ELPA is free software: you can redistribute it and/or modify
+!    it under the terms of the version 3 of the license of the
+!    GNU Lesser General Public License as published by the Free
+!    Software Foundation.
+!
+!    ELPA is distributed in the hope that it will be useful,
+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+!    GNU Lesser General Public License for more details.
+!
+!    You should have received a copy of the GNU Lesser General Public License
+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
+!
+!    ELPA reflects a substantial effort on the part of the original
+!    ELPA consortium, and we ask you to respect the spirit of the
+!    license that we chose: i.e., please contribute any changes you
+!    may have back to the original ELPA library distribution, and keep
+!    any derivatives of ELPA under the same license that we chose for
+!    the original distribution, the GNU Lesser General Public License.
+!
+! Author: Lorenz Huedepohl, MPCDF
+
 module aligned_mem
   use, intrinsic :: iso_c_binding
 
diff --git a/src/elpa2_kernels/elpa2_kernels_asm_x86_64.s b/src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
index 1ebcf625e2a0d2456ece30a40908014ed6c182a2..e08598f20ca50713d03268562e80c720d1d09791 100644
--- a/src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
+++ b/src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
@@ -1,10 +1,53 @@
+#    This file is part of ELPA.
+#
+#    The ELPA library was originally created by the ELPA consortium,
+#    consisting of the following organizations:
+#
+#    - Max Planck Computing and Data Facility (MPCDF), formerly known as
+#      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
+#    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
+#      Informatik,
+#    - Technische Universität München, Lehrstuhl für Informatik mit
+#      Schwerpunkt Wissenschaftliches Rechnen ,
+#    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
+#    - Max-Plack-Institut für Mathematik in den Naturwissenschaftrn,
+#      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
+#      and
+#    - IBM Deutschland GmbH
+#
+#
+#    More information can be found here:
+#    http://elpa.mpcdf.mpg.de/
+#
+#    ELPA is free software: you can redistribute it and/or modify
+#    it under the terms of the version 3 of the license of the
+#    GNU Lesser General Public License as published by the Free
+#    Software Foundation.
+#
+#    ELPA is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Lesser General Public License for more details.
+#
+#    You should have received a copy of the GNU Lesser General Public License
+#    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
+#
+#    ELPA reflects a substantial effort on the part of the original
+#    ELPA consortium, and we ask you to respect the spirit of the
+#    license that we chose: i.e., please contribute any changes you
+#    may have back to the original ELPA library distribution, and keep
+#    any derivatives of ELPA under the same license that we chose for
+#    the original distribution, the GNU Lesser General Public License.
+#
+
+
 # --------------------------------------------------------------------------------------------------
 #
 # This file contains the compute intensive kernels for the Householder transformations,
 # coded in x86_64 assembler and using SSE2/SSE3 instructions.
 #
 # It must be assembled with GNU assembler (just "as" on most Linux machines)
-# 
+#
 # Copyright of the original code rests with the authors inside the ELPA
 # consortium. The copyright of any additional modifications shall rest
 # with their original authors, but shall adhere to the licensing terms
diff --git a/src/elpa_c_interface.F90 b/src/elpa_c_interface.F90
index c4d14e41b33064006fcdd92279da5ad8c7b344ed..f81dc21819f9c0595ca685913bbd8ef024face0d 100644
--- a/src/elpa_c_interface.F90
+++ b/src/elpa_c_interface.F90
@@ -39,14 +39,7 @@
 !    any derivatives of ELPA under the same license that we chose for
 !    the original distribution, the GNU Lesser General Public License.
 !
-!
-! ELPA1 -- Faster replacements for ScaLAPACK symmetric eigenvalue routines
-!
-! Copyright of the original code rests with the authors inside the ELPA
-! consortium. The copyright of any additional modifications shall rest
-! with their original authors, but shall adhere to the licensing terms
-! distributed along with the original code in the file "COPYING".
-
+! Author: Andreas Marek, MCPDF
 #include "config-f90.h"
   !c> #include <complex.h>
 
diff --git a/src/elpa_reduce_add_vectors.X90 b/src/elpa_reduce_add_vectors.X90
index 76d75af4e14a4879f79fd86b21dd35dda698c9b0..a70c0024ea0b375261242b3ed30c61e3f33c879a 100644
--- a/src/elpa_reduce_add_vectors.X90
+++ b/src/elpa_reduce_add_vectors.X90
@@ -40,13 +40,7 @@
 !    any derivatives of ELPA under the same license that we chose for
 !    the original distribution, the GNU Lesser General Public License.
 !
-!
-! ELPA1 -- Faster replacements for ScaLAPACK symmetric eigenvalue routines
-!
-! Copyright of the original code rests with the authors inside the ELPA
-! consortium. The copyright of any additional modifications shall rest
-! with their original authors, but shall adhere to the licensing terms
-! distributed along with the original code in the file "COPYING".
+! Author: Andreas Marek, MPCDF
 #endif
 
 #if REALCASE==1
diff --git a/src/elpa_transpose_vectors.X90 b/src/elpa_transpose_vectors.X90
index 53d15aea415d1b16b2f7a66c63f918af6eabda02..6796fd688d790113050365ff31133ae408beed84 100644
--- a/src/elpa_transpose_vectors.X90
+++ b/src/elpa_transpose_vectors.X90
@@ -40,13 +40,11 @@
 !    any derivatives of ELPA under the same license that we chose for
 !    the original distribution, the GNU Lesser General Public License.
 !
-!
-! ELPA1 -- Faster replacements for ScaLAPACK symmetric eigenvalue routines
-!
 ! Copyright of the original code rests with the authors inside the ELPA
 ! consortium. The copyright of any additional modifications shall rest
 ! with their original authors, but shall adhere to the licensing terms
 ! distributed along with the original code in the file "COPYING".
+! Author: Andreas Marek, MPCDF
 #endif
 
 #if REALCASE==1
diff --git a/src/elpa_utilities.F90 b/src/elpa_utilities.F90
index a743c5dabe436f065649212eb61c997d8b43510c..cf28ca463fcc9244773a135cdd6ddf53dd9dd7e3 100644
--- a/src/elpa_utilities.F90
+++ b/src/elpa_utilities.F90
@@ -40,22 +40,12 @@
 !    the original distribution, the GNU Lesser General Public License.
 !
 !
-! ELPA1 -- Faster replacements for ScaLAPACK symmetric eigenvalue routines
-!
 ! Copyright of the original code rests with the authors inside the ELPA
 ! consortium. The copyright of any additional modifications shall rest
 ! with their original authors, but shall adhere to the licensing terms
 ! distributed along with the original code in the file "COPYING".
-
-
-
-! ELPA2 -- 2-stage solver for ELPA
 !
-! Copyright of the original code rests with the authors inside the ELPA
-! consortium. The copyright of any additional modifications shall rest
-! with their original authors, but shall adhere to the licensing terms
-! distributed along with the original code in the file "COPYING".
-
+! Author: Andreas Marek, MPCDF
 
 #include "config-f90.h"
 
diff --git a/src/mod_compute_hh_trafo_complex.F90 b/src/mod_compute_hh_trafo_complex.F90
index 9f5f68a9322fea642fe1090d62ab7fe42b123c77..c61ad1505700e459ed388970e53c5f37de1504e9 100644
--- a/src/mod_compute_hh_trafo_complex.F90
+++ b/src/mod_compute_hh_trafo_complex.F90
@@ -1,3 +1,46 @@
+!    This file is part of ELPA.
+!
+!    The ELPA library was originally created by the ELPA consortium,
+!    consisting of the following organizations:
+!
+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
+!      Informatik,
+!    - Technische Universität München, Lehrstuhl für Informatik mit
+!      Schwerpunkt Wissenschaftliches Rechnen ,
+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaftrn,
+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
+!      and
+!    - IBM Deutschland GmbH
+!
+!
+!    More information can be found here:
+!    http://elpa.mpcdf.mpg.de/
+!
+!    ELPA is free software: you can redistribute it and/or modify
+!    it under the terms of the version 3 of the license of the
+!    GNU Lesser General Public License as published by the Free
+!    Software Foundation.
+!
+!    ELPA is distributed in the hope that it will be useful,
+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+!    GNU Lesser General Public License for more details.
+!
+!    You should have received a copy of the GNU Lesser General Public License
+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
+!
+!    ELPA reflects a substantial effort on the part of the original
+!    ELPA consortium, and we ask you to respect the spirit of the
+!    license that we chose: i.e., please contribute any changes you
+!    may have back to the original ELPA library distribution, and keep
+!    any derivatives of ELPA under the same license that we chose for
+!    the original distribution, the GNU Lesser General Public License.
+!
+! Author: Andreas Marek, MPCDF
+
 module compute_hh_trafo_complex
 #include "config-f90.h"
   use elpa_mpi
diff --git a/src/mod_compute_hh_trafo_real.F90 b/src/mod_compute_hh_trafo_real.F90
index 0bd211032780320e5dfef5c083f573d6d77c7b42..fb6c7a0405d88c137d983808662806c5396188de 100644
--- a/src/mod_compute_hh_trafo_real.F90
+++ b/src/mod_compute_hh_trafo_real.F90
@@ -1,3 +1,46 @@
+!    This file is part of ELPA.
+!
+!    The ELPA library was originally created by the ELPA consortium,
+!    consisting of the following organizations:
+!
+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
+!      Informatik,
+!    - Technische Universität München, Lehrstuhl für Informatik mit
+!      Schwerpunkt Wissenschaftliches Rechnen ,
+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaftrn,
+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
+!      and
+!    - IBM Deutschland GmbH
+!
+!
+!    More information can be found here:
+!    http://elpa.mpcdf.mpg.de/
+!
+!    ELPA is free software: you can redistribute it and/or modify
+!    it under the terms of the version 3 of the license of the
+!    GNU Lesser General Public License as published by the Free
+!    Software Foundation.
+!
+!    ELPA is distributed in the hope that it will be useful,
+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+!    GNU Lesser General Public License for more details.
+!
+!    You should have received a copy of the GNU Lesser General Public License
+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
+!
+!    ELPA reflects a substantial effort on the part of the original
+!    ELPA consortium, and we ask you to respect the spirit of the
+!    license that we chose: i.e., please contribute any changes you
+!    may have back to the original ELPA library distribution, and keep
+!    any derivatives of ELPA under the same license that we chose for
+!    the original distribution, the GNU Lesser General Public License.
+!
+! Author: Andreas Marek, MPCDF
+
 module compute_hh_trafo_real
 #include "config-f90.h"
   use elpa_mpi
diff --git a/src/mod_mpi_stubs.F90 b/src/mod_mpi_stubs.F90
index f9970b1826a59da381ef89bec7ec91b441ed1cc1..451485f232fb09334b4d875f4e91333dc8d60ac9 100644
--- a/src/mod_mpi_stubs.F90
+++ b/src/mod_mpi_stubs.F90
@@ -1,4 +1,48 @@
+!    This file is part of ELPA.
+!
+!    The ELPA library was originally created by the ELPA consortium,
+!    consisting of the following organizations:
+!
+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
+!      Informatik,
+!    - Technische Universität München, Lehrstuhl für Informatik mit
+!      Schwerpunkt Wissenschaftliches Rechnen ,
+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaftrn,
+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
+!      and
+!    - IBM Deutschland GmbH
+!
+!
+!    More information can be found here:
+!    http://elpa.mpcdf.mpg.de/
+!
+!    ELPA is free software: you can redistribute it and/or modify
+!    it under the terms of the version 3 of the license of the
+!    GNU Lesser General Public License as published by the Free
+!    Software Foundation.
+!
+!    ELPA is distributed in the hope that it will be useful,
+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+!    GNU Lesser General Public License for more details.
+!
+!    You should have received a copy of the GNU Lesser General Public License
+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
+!
+!    ELPA reflects a substantial effort on the part of the original
+!    ELPA consortium, and we ask you to respect the spirit of the
+!    license that we chose: i.e., please contribute any changes you
+!    may have back to the original ELPA library distribution, and keep
+!    any derivatives of ELPA under the same license that we chose for
+!    the original distribution, the GNU Lesser General Public License.
+!
+! Author Andreas Marek, MPCDF
+
 #include "config-f90.h"
+
 module elpa_mpi_stubs
   use precision
   implicit none
diff --git a/src/mod_pack_unpack_complex.F90 b/src/mod_pack_unpack_complex.F90
index b51a9c38d85b8ce052d692f88c7c45a66ef4286f..27a1d08115a1a0968bfe4c23b8591461e34a8d12 100644
--- a/src/mod_pack_unpack_complex.F90
+++ b/src/mod_pack_unpack_complex.F90
@@ -1,3 +1,46 @@
+!    This file is part of ELPA.
+!
+!    The ELPA library was originally created by the ELPA consortium,
+!    consisting of the following organizations:
+!
+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
+!      Informatik,
+!    - Technische Universität München, Lehrstuhl für Informatik mit
+!      Schwerpunkt Wissenschaftliches Rechnen ,
+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaftrn,
+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
+!      and
+!    - IBM Deutschland GmbH
+!
+!
+!    More information can be found here:
+!    http://elpa.mpcdf.mpg.de/
+!
+!    ELPA is free software: you can redistribute it and/or modify
+!    it under the terms of the version 3 of the license of the
+!    GNU Lesser General Public License as published by the Free
+!    Software Foundation.
+!
+!    ELPA is distributed in the hope that it will be useful,
+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+!    GNU Lesser General Public License for more details.
+!
+!    You should have received a copy of the GNU Lesser General Public License
+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
+!
+!    ELPA reflects a substantial effort on the part of the original
+!    ELPA consortium, and we ask you to respect the spirit of the
+!    license that we chose: i.e., please contribute any changes you
+!    may have back to the original ELPA library distribution, and keep
+!    any derivatives of ELPA under the same license that we chose for
+!    the original distribution, the GNU Lesser General Public License.
+!
+! Author: Andreas Marek, MPCDF
+
 module pack_unpack_complex
 #include "config-f90.h"
   implicit none
diff --git a/src/mod_pack_unpack_real.F90 b/src/mod_pack_unpack_real.F90
index 7bb58e5f4410a8d28838b9040450b237fdbd413a..c9ca3f298feab696be4a70bde8788c15336be47e 100644
--- a/src/mod_pack_unpack_real.F90
+++ b/src/mod_pack_unpack_real.F90
@@ -1,3 +1,46 @@
+!    This file is part of ELPA.
+!
+!    The ELPA library was originally created by the ELPA consortium,
+!    consisting of the following organizations:
+!
+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
+!      Informatik,
+!    - Technische Universität München, Lehrstuhl für Informatik mit
+!      Schwerpunkt Wissenschaftliches Rechnen ,
+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaftrn,
+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
+!      and
+!    - IBM Deutschland GmbH
+!
+!
+!    More information can be found here:
+!    http://elpa.mpcdf.mpg.de/
+!
+!    ELPA is free software: you can redistribute it and/or modify
+!    it under the terms of the version 3 of the license of the
+!    GNU Lesser General Public License as published by the Free
+!    Software Foundation.
+!
+!    ELPA is distributed in the hope that it will be useful,
+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+!    GNU Lesser General Public License for more details.
+!
+!    You should have received a copy of the GNU Lesser General Public License
+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
+!
+!    ELPA reflects a substantial effort on the part of the original
+!    ELPA consortium, and we ask you to respect the spirit of the
+!    license that we chose: i.e., please contribute any changes you
+!    may have back to the original ELPA library distribution, and keep
+!    any derivatives of ELPA under the same license that we chose for
+!    the original distribution, the GNU Lesser General Public License.
+!
+! Author: Andreas Marek, MPCDF
+
 module pack_unpack_real
 #include "config-f90.h"
   implicit none
diff --git a/src/mod_precision.f90 b/src/mod_precision.f90
index 5b10e4eb17c89fac18a1d383f576508feaead393..65c091e2946be7269cb0c9f0e04bfffa9ef3f526 100644
--- a/src/mod_precision.f90
+++ b/src/mod_precision.f90
@@ -1,3 +1,45 @@
+!    This file is part of ELPA.
+!
+!    The ELPA library was originally created by the ELPA consortium,
+!    consisting of the following organizations:
+!
+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
+!      Informatik,
+!    - Technische Universität München, Lehrstuhl für Informatik mit
+!      Schwerpunkt Wissenschaftliches Rechnen ,
+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaftrn,
+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
+!      and
+!    - IBM Deutschland GmbH
+!
+!
+!    More information can be found here:
+!    http://elpa.mpcdf.mpg.de/
+!
+!    ELPA is free software: you can redistribute it and/or modify
+!    it under the terms of the version 3 of the license of the
+!    GNU Lesser General Public License as published by the Free
+!    Software Foundation.
+!
+!    ELPA is distributed in the hope that it will be useful,
+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+!    GNU Lesser General Public License for more details.
+!
+!    You should have received a copy of the GNU Lesser General Public License
+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
+!
+!    ELPA reflects a substantial effort on the part of the original
+!    ELPA consortium, and we ask you to respect the spirit of the
+!    license that we chose: i.e., please contribute any changes you
+!    may have back to the original ELPA library distribution, and keep
+!    any derivatives of ELPA under the same license that we chose for
+!    the original distribution, the GNU Lesser General Public License.
+!
+! Author: Andreas Marek, MPCDF
 module precision
   use iso_c_binding, only : C_FLOAT, C_DOUBLE, C_INT32_T, C_INT64_T
 
diff --git a/src/mod_time_c.F90 b/src/mod_time_c.F90
index 80ff2c1272dfa46d067fc91b56bc11b5a954a691..45b750bc8c5238c40eebde2b35dbc5131c0ba78a 100644
--- a/src/mod_time_c.F90
+++ b/src/mod_time_c.F90
@@ -1,3 +1,46 @@
+!    This file is part of ELPA.
+!
+!    The ELPA library was originally created by the ELPA consortium,
+!    consisting of the following organizations:
+!
+!    - Max Planck Computing and Data Facility (MPCDF), formerly known as
+!      Rechenzentrum Garching der Max-Planck-Gesellschaft (RZG),
+!    - Bergische Universität Wuppertal, Lehrstuhl für angewandte
+!      Informatik,
+!    - Technische Universität München, Lehrstuhl für Informatik mit
+!      Schwerpunkt Wissenschaftliches Rechnen ,
+!    - Fritz-Haber-Institut, Berlin, Abt. Theorie,
+!    - Max-Plack-Institut für Mathematik in den Naturwissenschaftrn,
+!      Leipzig, Abt. Komplexe Strukutren in Biologie und Kognition,
+!      and
+!    - IBM Deutschland GmbH
+!
+!
+!    More information can be found here:
+!    http://elpa.mpcdf.mpg.de/
+!
+!    ELPA is free software: you can redistribute it and/or modify
+!    it under the terms of the version 3 of the license of the
+!    GNU Lesser General Public License as published by the Free
+!    Software Foundation.
+!
+!    ELPA is distributed in the hope that it will be useful,
+!    but WITHOUT ANY WARRANTY; without even the implied warranty of
+!    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+!    GNU Lesser General Public License for more details.
+!
+!    You should have received a copy of the GNU Lesser General Public License
+!    along with ELPA.  If not, see <http://www.gnu.org/licenses/>
+!
+!    ELPA reflects a substantial effort on the part of the original
+!    ELPA consortium, and we ask you to respect the spirit of the
+!    license that we chose: i.e., please contribute any changes you
+!    may have back to the original ELPA library distribution, and keep
+!    any derivatives of ELPA under the same license that we chose for
+!    the original distribution, the GNU Lesser General Public License.
+!
+! Author: Lorenz Huedepohl, MPCDF
+
 #include "config-f90.h"
 
 module time_c
diff --git a/src/redist_band.X90 b/src/redist_band.X90
index 328659aa775b98d9f3ee4ec3e68977d56014e63d..85127ff25377d7b59c8022368e18c15b64dfb3bc 100644
--- a/src/redist_band.X90
+++ b/src/redist_band.X90
@@ -40,13 +40,7 @@
 !    any derivatives of ELPA under the same license that we chose for
 !    the original distribution, the GNU Lesser General Public License.
 !
-!
-! ELPA1 -- Faster replacements for ScaLAPACK symmetric eigenvalue routines
-!
-! Copyright of the original code rests with the authors inside the ELPA
-! consortium. The copyright of any additional modifications shall rest
-! with their original authors, but shall adhere to the licensing terms
-! distributed along with the original code in the file "COPYING".
+! Author: Andreas Marek, MPCDF
 #endif
 ! --------------------------------------------------------------------------------------------------
 ! redist_band: redistributes band from 2D block cyclic form to 1D band