diff --git a/archivemail.py b/archivemail.py
index b0acd04..178e571 100755
--- a/archivemail.py
+++ b/archivemail.py
@@ -1,6 +1,8 @@
 #! /usr/bin/env python
 ############################################################################
-# Copyright (C) 2002  Paul Rodger <paul@paulrodger.com>
+# Copyright (C) 2002  Paul Rodger <paul@paulrodger.com>,
+#           (C) 2006  Peter Poeml <poeml@suse.de>,
+#           (C) 2006  Nikolaus Schulz <microschulz@web.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/setup.py b/setup.py
index af13bab..dcea84f 100755
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,8 @@ setup(name="archivemail",
       url="http://archivemail.sourceforge.net/",
       author="Paul Rodger",
       author_email="paul@paulrodger.com",
+      maintainer="Archivemail maintainer team",
+      maintainer_email="archivemail-devel@lists.sourceforge.net",
       scripts=["archivemail.py"],
       data_files=[("man/man1", ["archivemail.1"])],
       )
diff --git a/test_archivemail.py b/test_archivemail.py
index 3ac6c84..78c5c91 100755
--- a/test_archivemail.py
+++ b/test_archivemail.py
@@ -1,6 +1,7 @@
 #! /usr/bin/env python
 ############################################################################
 # Copyright (C) 2002  Paul Rodger <paul@paulrodger.com>
+#           (C) 2006  Nikolaus Schulz <microschulz@web.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by