diff --git a/AUTHORS b/AUTHORS
index eabc8ce5f19..0bfa201ff11 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -95,11 +95,12 @@ Nils Binz
 Nishchay Suri
 O.V. Rud
 Owen A. Hickey-Moriarty
+Pascal Hebbeker
 Patrick Diggins
 Patrick Kreissl
 Pedro Ojeda
 Pedro Sanchez
-Peter Kosovan
+Peter Košovan
 Pierre de Buyl
 Robert Kaufmann
 Robin Bardakcioglu
@@ -117,6 +118,7 @@ Steffen Hirschmann
 Stephan Gekle
 Thomas Spura
 Tilak Waelde
+Tim Meiler
 Timo Schürg
 Tobias Rau
 Tobias Richter
diff --git a/maintainer/add_missing_headers.sh b/maintainer/add_missing_headers.sh
index 46deedc892f..5111dd7f200 100755
--- a/maintainer/add_missing_headers.sh
+++ b/maintainer/add_missing_headers.sh
@@ -40,6 +40,7 @@ for f in ${py_files}; do
     (sed -e 's/^/# /' maintainer/header_template.txt | sed 's/ $//'; cat "${f}") > "${tmp}"
   fi
   cp "${tmp}" "${f}"
+  echo "${f}"
 done
 # process c++/cuda/doxygen files
 for f in ${cpp_files}; do
@@ -48,5 +49,6 @@ for f in ${cpp_files}; do
    echo ' */'
    cat "${f}") > "${tmp}"
   cp "${tmp}" "${f}"
+  echo "${f}"
 done
 rm "${tmp}"
diff --git a/maintainer/find_potentially_missing_authors.sh b/maintainer/find_potentially_missing_authors.sh
index 2475155e8a2..a0c9d87f9a8 100755
--- a/maintainer/find_potentially_missing_authors.sh
+++ b/maintainer/find_potentially_missing_authors.sh
@@ -23,11 +23,9 @@
 
 cd "$(git rev-parse --show-toplevel)"
 
-git log |
-  grep -i ^author |
-  cut -f2- -d\  |
-  sed -e 's/ <.*//' |
-  sort -u |
+git shortlog -s |
+  sed -r 's/^ *[0-9]+\t//' |
+  sort |
   while read author; do
-    grep -i "${author}" AUTHORS >/dev/null || echo "Missing: ${author}"
+    grep -iF "${author}" AUTHORS >/dev/null || echo "Missing: ${author}"
   done
diff --git a/maintainer/update_header.sh b/maintainer/update_header.sh
index 4bd5936e6df..5ae57bef308 100755
--- a/maintainer/update_header.sh
+++ b/maintainer/update_header.sh
@@ -23,7 +23,7 @@
 # 1. Find files that do have copyright disclaimers
 # 1.1. Find files that do not have the current year in the disclaimer
 # 1.1.1. Find files that have "The ESPResSo project" in the line
-# 1.1.1.1. Append 2012 to the years
+# 1.1.1.1. Append <current_year> to the years
 # 1.1.2. Insert new line "Copyright (C) <current_year> The ESPResSo
 #        project" before the copyright disclaimer
 #
@@ -64,8 +64,10 @@ disclaimer="Copyright (C) ${current_year} The ESPResSo project"
 echo "    \"${disclaimer}\""
 tmpfile=$(mktemp)
 for file in ${noproject_files}; do
-    echo "    ${file}"
     perl -pe "if (!\$done) { s/^(.*)Copyright/\1${disclaimer}\n\1Copyright/ and \$done=1; }" "${file}" > "${tmpfile}"
-    cat "${tmpfile}" > "${file}"
+    if ! cmp --quiet "${file}" "${tmpfile}"; then
+        echo "${file}"
+        cp "${tmpfile}" "${file}"
+    fi
 done
 rm "${tmpfile}"