diff --git a/pep-0000.txt b/pep-0000.txt
index 8c578f093..a2e0e400b 100644
--- a/pep-0000.txt
+++ b/pep-0000.txt
@@ -14,7 +14,70 @@ Introduction
     once assigned are never changed.
 
 
-Index
+Index by Category
+
+     num  filename      title                                  owner
+     ---  ------------  -----                                  -----
+
+ Meta-PEPs (PEPs about PEPs)
+
+ I     0  pep-0000.txt  Index of Python Enhancement Proposals  Warsaw
+ I     1  pep-0001.txt  PEP Guidelines                         Warsaw, Hylton
+ I     2  pep-0002.txt  Procedure for Adding New Modules       Raymond
+ I     3  pep-0003.txt  Guidelines for Handling Bug Reports    Hylton
+ I     4  pep-0004.txt  Deprecation of Standard Modules        von Loewis
+ I     5  pep-0005.txt  Guidelines for Language Evolution      Prescod
+
+ Active PEPs (under serious consideration for Python 2.1 - even if empty)
+
+ I    42  pep-0042.txt  Small Feature Requests                 Hylton
+ S   207  pep-0207.txt  Rich Comparisons                       Ascher
+ S   208  pep-0208.txt  Reworking the Coercion Model           Ascher
+ S   217  pep-0217.txt  Display Hook for Interactive Use       Zadka
+ S   222  pep-0222.txt  Web Library Enhancements               Kuchling
+ I   226  pep-0226.txt  Python 2.1 Release Schedule            Hylton
+ S   227  pep-0227.txt  Statically Nested Scopes               Hylton
+
+ Pie-in-the-sky PEPs (not ready; may become active yet)
+
+ I   206  pep-0206.txt  2.0 Batteries Included                 Zadka
+ SD  211  pep-0211.txt  Adding New Linear Algebra Operators    Wilson
+ SD  212  pep-0212.txt  Loop Counter Iteration                 Schneider-Kamp
+ SD  213  pep-0213.txt  Attribute Access Handlers              Prescod
+ SD  224  pep-0224.txt  Attribute Docstrings                   Lemburg
+ SD  225  pep-0225.txt  Elementwise/Objectwise Operators       Zhu, Lielens
+
+ Incomplete PEPs (only an abstract)
+
+ SD  218  pep-0218.txt  Adding a Built-In Set Object Type      Wilson
+ SD  219  pep-0219.txt  Stackless Python                       McMillan
+ I   220  pep-0220.txt  Coroutines, Generators, Continuations  McMillan
+
+ Empty PEPs (nothing written yet)
+
+ SD  205  pep-0205.txt  Weak References                        Drake
+ SD  209  pep-0209.txt  Adding Multidimensional Arrays         Ascher
+ SD  210  pep-0210.txt  Decoupling the Interpreter Loop        Ascher
+ SD  215  pep-0215.txt  String Interpolation                   Yee
+ I   216  pep-0216.txt  Docstring Format                       Zadka
+
+ Finished PEPs (done, implemented)
+
+ I   160  pep-0160.txt  Python 1.6 Release Schedule            Drake
+ IF  200  pep-0200.txt  Python 2.0 Release Schedule            Hylton
+ SF  201  pep-0201.txt  Lockstep Iteration                     Warsaw
+ S   202  pep-0202.txt  List Comprehensions                    Peters
+ SF  203  pep-0203.txt  Augmented Assignments                  Wouters
+ SF  214  pep-0214.txt  Extended Print Statement               Warsaw
+ SF  221  pep-0221.txt  Import As                              Wouters
+ SF  223  pep-0223.txt  Change the Meaning of \x Escapes       Peters
+
+ Rejected PEPs
+
+ SR  204  pep-0204.txt  Range Literals                         Wouters
+
+
+Numerical Index
 
      num  filename      title                                  owner
      ---  ------------  -----                                  -----
@@ -35,8 +98,8 @@ Index
  SR  204  pep-0204.txt  Range Literals                         Wouters
  SD  205  pep-0205.txt  Weak References                        Drake
  I   206  pep-0206.txt  2.0 Batteries Included                 Zadka
- SD  207  pep-0207.txt  Rich Comparisons                       Ascher
- SD  208  pep-0208.txt  Reworking the Coercion Model           Ascher
+ S   207  pep-0207.txt  Rich Comparisons                       Ascher
+ S   208  pep-0208.txt  Reworking the Coercion Model           Ascher
  SD  209  pep-0209.txt  Adding Multidimensional Arrays         Ascher
  SD  210  pep-0210.txt  Decoupling the Interpreter Loop        Ascher
  SD  211  pep-0211.txt  Adding New Linear Algebra Operators    Wilson
@@ -45,14 +108,14 @@ Index
  SF  214  pep-0214.txt  Extended Print Statement               Warsaw
  SD  215  pep-0215.txt  String Interpolation                   Yee
  I   216  pep-0216.txt  Docstring Format                       Zadka
- SD  217  pep-0217.txt  Display Hook for Interactive Use       Zadka
+ S   217  pep-0217.txt  Display Hook for Interactive Use       Zadka
  SD  218  pep-0218.txt  Adding a Built-In Set Object Type      Wilson
  SD  219  pep-0219.txt  Stackless Python                       McMillan
  I   220  pep-0220.txt  Coroutines, Generators, Continuations  McMillan
  SF  221  pep-0221.txt  Import As                              Wouters
- SD  222  pep-0222.txt  Web Library Enhancements               Kuchling
+ S   222  pep-0222.txt  Web Library Enhancements               Kuchling
  SF  223  pep-0223.txt  Change the Meaning of \x Escapes       Peters
- S   224  pep-0224.txt  Attribute Docstrings                   Lemburg
+ SD  224  pep-0224.txt  Attribute Docstrings                   Lemburg
  SD  225  pep-0225.txt  Elementwise/Objectwise Operators       Zhu, Lielens
  I   226  pep-0226.txt  Python 2.1 Release Schedule            Hylton
  S   227  pep-0227.txt  Statically Nested Scopes               Hylton