diff --git a/.mailmap b/.mailmap
index 5adfefb..825019f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,4 +13,4 @@ csoft2k <csoft2k@hotmail.com>
 Sergio Pulgarin <sergio.pulgarin@gmail.com>
 reck31 <rakesh.gunduka@gmail.com>
 Alex Debiasio <alex.debiasio@thinkin.io>             <alex.debiasio@studenti.unitn.it>
-Maximilian Wagenbach <maximilian.wagenbach@native-instruments.de> <maximilian.wagenbach@native-instruments.de>
+Maximilian Wagenbach <maximilian.wagenbach@native-instruments.de>
diff --git a/doc/generate_authors.sh b/doc/generate_authors.sh
index 1fcda40..bf35156 100755
--- a/doc/generate_authors.sh
+++ b/doc/generate_authors.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 GENLIST=$(git shortlog -s -n | cut -f2 | sort -f)
+GENLIST_W_MAIL=$(git shortlog -s -e -n | cut -f2 | sort -f)
 AUTHORSFILE="$(dirname $0)/../AUTHORS"
 TEMPAUTHORSFILE="/tmp/python-escpos-authorsfile"
 
@@ -12,7 +13,9 @@ if [ "$#" -eq 1 ]
 	echo "\nNew authorsfile:\n"
 	cat $TEMPAUTHORSFILE
 	echo "\nUsing diff on files...\n"
-        diff --suppress-common-lines -b --from-file $AUTHORSFILE $TEMPAUTHORSFILE
+	diff --suppress-common-lines -b --from-file $AUTHORSFILE $TEMPAUTHORSFILE
+	echo "Authors with mail addresses:\n"
+	echo "$GENLIST_W_MAIL"
     else
 	echo "$GENLIST">$AUTHORSFILE
 fi