diff --git a/AUTHORS b/AUTHORS
index f507a1ab..dd8a1815 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,12 @@
 
-ntfsprogs is written and maintained by Anton Altaparmakov <aia21@cantab.net>.
+ntfsprogs is written and maintained by the Linux-NTFS project, you can contact
+us at <linux-ntfs-dev at lists.sf.net>.
 
-Current active developers on the project are (in alphabetical order):
+Current active project members are (in alphabetical order):
 
-Anton Altaparmakov <aia21@cantab.net>
-Yuval Fledel (no email address on request)
-Yura Pakhuchiy <pakhuchiy@gmail.com>
-Richard Russon <ntfs@flatcap.org>
-Szakacsits Szabolcs <szaka@sienet.hu>
+Anton Altaparmakov <aia21 at cantab.net>
+Mario Emmenlauer <mario at emmenlauer.de>
+Yuval Fledel <yuvalfl at gmail.com>
+Yura Pakhuchiy <pakhuchiy at gmail.com>
+Richard Russon <ntfs at flatcap.org>
+Szabolcs Szakacsits <szaka at sienet.hu>
diff --git a/CREDITS b/CREDITS
index b42c7dc7..471d1cbb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3,8 +3,8 @@ project.
 
 The list is sorted alphabetically, so please keep it this way!
 
-Please let me know (email Anton Altaparmakov <aia21@cantab.net>) if you believe
-someone is missing or if you prefer to not be listed.
+Please contact <linux-ntfs-dev at lists.sf.net> if you believe someone is
+missing or if you prefer not to be listed.
 
 
 Alexei Alexandrov <alex_alexandrov@hotmail.com>
diff --git a/autogen.sh b/autogen.sh
index b4d0a559..150e902d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Run this to generate all the initial makefiles, etc.
+# Run this to generate configure, Makefile.in's, etc
 
 if test "$srcdir" == ""; then
 	srcdir=.