diff --git a/Misc/NEWS b/Misc/NEWS
index 822695d..9938cea 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,11 @@
 - Issues #8909: Added the size of the bitmap used in the installer created by
   distutils' bdist_wininst. Patch by Anatoly Techtonik.
 
+Misc
+----
+
+- Issue #8362: Add maintainers.rst: list of module maintainers
+
 
 What's New in Python 2.7 Release Candidate 1?
 =============================================
@@ -70,7 +75,7 @@
 - Issue #7079: Fix a possible crash when closing a file object while using it
   from another thread.  Patch by Daniel Stutzbach.
 
-- Issue #8868: Fix that ensures that python scripts have access to the 
+- Issue #8868: Fix that ensures that python scripts have access to the
   Window Server again in a framework build on MacOSX 10.5 or earlier.
 
 C-API
@@ -175,7 +180,7 @@
 - Display installer warning that Windows 2000 won't be supported in future
   releases.
 
-- Issues #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for 
+- Issues #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for
   multiprocessing only.
 
 Tools/Demos
diff --git a/Misc/maintainers.rst b/Misc/maintainers.rst
new file mode 100644
index 0000000..a80d8f2
--- /dev/null
+++ b/Misc/maintainers.rst
@@ -0,0 +1,300 @@
+Maintainers Index
+=================
+
+This document has tables that list Python Modules, Tools, Platforms and
+Interest Areas and names for each item that indicate a maintainer or an
+expert in the field.  This list is intended to be used by issue submitters,
+issue triage people, and other issue participants to find people to add to
+the nosy list or to contact directly by email for help and decisions on
+feature requests and bug fixes.  People on this list may be asked to render
+final judgement on a feature or bug.  If no active maintainer is listed for
+a given module, then questionable changes should go to python-dev, while
+any other issues can and should be decided by any committer.
+
+The Platform and Interest Area tables list broader fields in which various
+people have expertise.  These people can also be contacted for help,
+opinions, and decisions when issues involve their areas.
+
+If a listed maintainer does not respond to requests for comment for an
+extended period (three weeks or more), they should be marked as inactive
+in this list by placing the word 'inactive' in parenthesis behind their
+tracker id.  They are of course free to remove that inactive mark at
+any time.
+
+Committers should update this table as their areas of expertise widen.
+New topics may be added to the third table at will.
+
+The existence of this list is not meant to indicate that these people
+*must* be contacted for decisions; it is, rather, a resource to be used
+by non-committers to find responsible parties, and by committers who do
+not feel qualified to make a decision in a particular context.
+
+See also `PEP 291`_ and `PEP 360`_ for information about certain modules
+with special rules.
+
+.. _`PEP 291`: http://www.python.org/dev/peps/pep-0291/
+.. _`PEP 360`: http://www.python.org/dev/peps/pep-0360/
+
+
+==================  ===========
+Module              Maintainers
+==================  ===========
+__builtin__
+__future__
+__main__            gvanrossum
+_dummy_thread       brett.cannon
+_thread
+abc
+aifc                r.david.murray
+argparse            bethard
+array
+ast
+asynchat            josiahcarlson, giampaolo.rodola
+asyncore            josiahcarlson, giampaolo.rodola
+atexit
+audioop
+base64
+BaseHTTPServer
+bdb
+binascii
+binhex
+bisect              rhettinger
+bz2
+calendar
+cgi
+CGIHTTPServer
+cgitb
+chunk
+cmath               mark.dickinson
+cmd
+code
+codecs              lemburg, doerwalter
+codeop
+collections         rhettinger
+colorsys
+compileall
+ConfigParser
+contextlib
+copy                alexandre.vassalotti
+copy_reg            alexandre.vassalotti
+cProfile
+crypt
+csv
+ctypes              theller
+curses              andrew.kuchling
+datetime            alexander.belopolsky
+dbm
+decimal             facundobatista, rhettinger, mark.dickinson
+difflib             tim_one
+dis
+distutils           tarek
+doctest             tim_one (inactive)
+dummy_threading     brett.cannon
+email               barry, r.david.murray
+encodings           lemburg, loewis
+errno
+exceptions
+fcntl
+filecmp
+fileinput
+fnmatch
+formatter
+fpectl
+fractions           mark.dickinson, rhettinger
+ftplib              giampaolo.rodola
+functools
+gc                  pitrou
+getopt
+getpass
+gettext             loewis
+glob
+grp
+gzip
+hashlib
+heapq               rhettinger
+hmac
+htmlentitydefs
+htmllib
+HTMLParser
+httplib
+idlelib             kbk
+imaplib
+imghdr
+imp
+importlib           brett.cannon
+inspect
+io                  pitrou, benjamin.peterson
+itertools           rhettinger
+json                bob.ippolito (inactive)
+keyword
+lib2to3             benjamin.peterson
+linecache
+locale              loewis, lemburg
+logging             vsajip
+macpath
+mailbox             andrew.kuchling
+mailcap
+marshal
+math                mark.dickinson, rhettinger
+mimetypes
+mmap
+modulefinder        theller, jvr
+msilib              loewis
+msvcrt
+multiprocessing     jnoller
+netrc
+nis
+nntplib
+numbers
+operator
+optparse            aronacher
+os                  loewis
+ossaudiodev
+parser
+pdb
+pickle              alexandre.vassalotti, pitrou
+pickletools         alexandre.vassalotti
+pipes
+pkgutil
+platform            lemburg
+plistlib
+poplib
+posix
+pprint              fdrake
+pstats
+pty
+pwd
+py_compile
+pybench             lemburg, pitrou
+pyclbr
+pydoc
+Queue               rhettinger
+quopri
+random              rhettinger
+re                  effbot (inactive), pitrou
+readline
+reprlib
+resource
+rlcompleter
+runpy               ncoghlan
+sched
+select
+shelve
+shlex
+shutil              tarek
+signal
+SimpleHTTPServer
+site
+smtpd
+smtplib
+sndhdr
+socket
+SocketServer
+spwd
+sqlite3             ghaering
+ssl                 janssen, pitrou, giampaolo.rodola
+stat
+string
+stringprep
+struct              mark.dickinson
+subprocess          astrand (inactive)
+sunau
+symbol
+symtable            benjamin.peterson
+sys
+sysconfig           tarek
+syslog              jafo
+tabnanny            tim_one
+tarfile             lars.gustaebel
+telnetlib
+tempfile
+termios
+test
+textwrap
+threading
+time                alexander.belopolsky
+timeit
+Tkinter             gpolo
+token               georg.brandl
+tokenize
+trace
+traceback           georg.brandl
+tty
+turtle              gregorlingl
+types
+unicodedata         loewis, lemburg, ezio.melotti
+unittest            michael.foord
+urllib              orsenthil
+uu
+uuid
+warnings            brett.cannon
+wave
+weakref             fdrake
+webbrowser          georg.brandl
+winreg
+winsound            effbot (inactive)
+wsgiref             pje
+xdrlib
+xml                 loewis
+xml.etree           effbot (inactive)
+xmlrpc              loewis
+zipfile
+zipimport
+zlib
+==================  ===========
+
+
+==================  ===========
+Tool                Maintainers
+------------------  -----------
+pybench             lemburg
+
+
+==================  ===========
+Platform            Maintainers
+------------------  -----------
+AIX
+Cygwin              jlt63
+FreeBSD
+HP-UX
+Linux
+Mac                 ronaldoussoren
+NetBSD1
+OS2/EMX             aimacintyre
+Solaris
+Windows
+==================  ===========
+
+
+==================  ===========
+Interest Area       Maintainers
+------------------  -----------
+algorithms
+ast/compiler        ncoghlan, benjamin.peterson, brett.cannon, georg.brandl
+autoconf/makefiles
+bsd
+buildbots
+bytecode            pitrou
+data formats        mark.dickinson, georg.brandl
+database            lemburg
+documentation       georg.brandl, ezio.melotti
+GUI
+i18n                lemburg
+import machinery    brett.cannon, ncoghlan
+io                  pitrou, benjamin.peterson
+locale              lemburg, loewis
+mathematics         mark.dickinson, eric.smith, lemburg
+memory management   tim_one, lemburg
+networking          giampaolo.rodola
+packaging           tarek, lemburg
+py3 transition      benjamin.peterson
+release management  tarek, lemburg, benjamin.peterson, barry, loewis,
+                    gvanrossum, anthonybaxter
+str.format          eric.smith
+time and dates      lemburg
+testing             michael.foord, pitrou, giampaolo.rodola
+threads
+tracker
+unicode             lemburg, ezio.melotti, haypo
+version control
+==================  ===========