Use the get_contact*() accessors instead of get_maintainer*()
diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
index 2346696..7ef3a42 100644
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -992,8 +992,8 @@
         pkg_info.write('Version: %s\n' % self.get_version() )
         pkg_info.write('Summary: %s\n' % self.get_description() )
         pkg_info.write('Home-page: %s\n' % self.get_url() )
-        pkg_info.write('Author: %s\n' % self.get_maintainer() )
-        pkg_info.write('Author-email: %s\n' % self.get_maintainer_email() )
+        pkg_info.write('Author: %s\n' % self.get_contact() )
+        pkg_info.write('Author-email: %s\n' % self.get_contact_email() )
         pkg_info.write('License: %s\n' % self.get_licence() )
 
         long_desc = rfc822_escape( self.get_long_description() )