diff --git a/Misc/README b/Misc/README
index ebeec20..bb98b3d 100644
--- a/Misc/README
+++ b/Misc/README
@@ -7,35 +7,37 @@
 Files found here
 ----------------
 
-ACKS		Acknowledgements
-AIX-NOTES	Notes for building Python on AIX
-BeOS-NOTES	Notes for building on BeOS
-BeOS-setup.py	setup.py replacement for BeOS, see BeOS-NOTES
-build.sh	Script to build and test latest Python from the repository
-cheatsheet	Quick summary of Python by Ken Manheimer
-developers.txt	A history of who got developer permissions, and why
-gdbinit		Handy stuff to put in your .gdbinit file, if you use gdb
-HISTORY		News from previous releases -- oldest last
-indent.pro	GNU indent profile approximating my C style
-NEWS		News for this release (for some meaning of "this")
-NEWS.help	How to edit NEWS
-Porting		Mini-FAQ on porting to new platforms
-PURIFY.README	Information for Purify users
-pymemcompat.h	Memory interface compatibility file.
-python.man	UNIX man page for the python interpreter
-python-mode.el	Emacs mode for editing Python programs
-python.pc.in	Package configuration info template for pkg-config
-python-wing.wpr Wing IDE project file
-README		The file you're reading now
-README.coverity	Information about running Coverity's Prevent on Python
-README.klocwork	Information about running Klocwork's K7 on Python
-README.OpenBSD	Help for building problems on OpenBSD
-README.valgrind	Information for Valgrind users, see valgrind-python.supp
-RFD		Request For Discussion about a Python newsgroup
-RPM		(Old) tools to build RPMs
-setuid-prog.c	C helper program for set-uid Python scripts
-SpecialBuilds.txt     Describes extra symbols you can set for debug builds
-TextMate	A TextMate bundle for Python development
-valgrind-python.supp  Valgrind suppression file, see README.valgrind
-vgrindefs	Python configuration for vgrind (a generic pretty printer)
-Vim		Python development utilities for the Vim editor
\ No newline at end of file
+ACKS                    Acknowledgements
+AIX-NOTES               Notes for building Python on AIX
+BeOS-NOTES              Notes for building on BeOS
+BeOS-setup.py           setup.py replacement for BeOS, see BeOS-NOTES
+build.sh                Script to build and test latest Python from the repository
+cheatsheet              Quick summary of Python by Ken Manheimer
+developers.txt          A history of who got developer permissions, and why
+gdbinit                 Handy stuff to put in your .gdbinit file, if you use gdb
+HISTORY                 News from previous releases -- oldest last
+indent.pro              GNU indent profile approximating my C style
+maintainers.rst         A list of maintainers for library modules
+NEWS                    News for this release (for some meaning of "this")
+NEWS.help               How to edit NEWS
+Porting                 Mini-FAQ on porting to new platforms
+PURIFY.README           Information for Purify users
+pymemcompat.h           Memory interface compatibility file.
+python-config.in        Python script template for python-config
+python.man              UNIX man page for the python interpreter
+python-mode.el          Emacs mode for editing Python programs
+python.pc.in            Package configuration info template for pkg-config
+python-wing.wpr         Wing IDE project file
+README                  The file you're reading now
+README.coverity         Information about running Coverity's Prevent on Python
+README.klocwork         Information about running Klocwork's K7 on Python
+README.OpenBSD          Help for building problems on OpenBSD
+README.valgrind         Information for Valgrind users, see valgrind-python.supp
+RFD                     Request For Discussion about a Python newsgroup
+RPM                     (Old) tools to build RPMs
+setuid-prog.c           C helper program for set-uid Python scripts
+SpecialBuilds.txt       Describes extra symbols you can set for debug builds
+TextMate                A TextMate bundle for Python development
+valgrind-python.supp    Valgrind suppression file, see README.valgrind
+vgrindefs               Python configuration for vgrind (a generic pretty printer)
+Vim                     Python development utilities for the Vim editor
diff --git a/Misc/maintainers.rst b/Misc/maintainers.rst
index fc2401c..ad8334d 100644
--- a/Misc/maintainers.rst
+++ b/Misc/maintainers.rst
@@ -25,8 +25,8 @@
 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.
+Committers should update these tables as their areas of expertise widen.
+New topics may be added to the Interest Area 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
@@ -259,6 +259,7 @@
 Tool                Maintainers
 ------------------  -----------
 pybench             lemburg
+==================  ===========
 
 
 ==================  ===========
@@ -284,6 +285,7 @@
 ast/compiler        ncoghlan, benjamin.peterson, brett.cannon, georg.brandl
 autoconf/makefiles
 bsd
+bug tracker         ezio.melotti
 buildbots
 bytecode            pitrou
 data formats        mark.dickinson, georg.brandl
@@ -302,10 +304,9 @@
 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             pitrou
-bug tracker         ezio.melotti
+time and dates      lemburg
 unicode             lemburg, ezio.melotti, haypo
 version control
 ==================  ===========