diff --git a/pep-0101.txt b/pep-0101.txt
index 937607d33..46b262482 100644
--- a/pep-0101.txt
+++ b/pep-0101.txt
@@ -57,9 +57,9 @@ How to Make A Release
 
       At this point, nobody except the RM should make any commits to
       the branch (or his duly assigned agents, i.e. Guido the BDFL,
-      Fred Drake for documentation, or Tim Peters for Windows).  If
-      the RM screwed up and some desperate last minute change to the
-      branch is necessary, it can mean extra work for Fred and Tim.
+      Fred Drake for documentation, or Martin v. Loewis for Windows).  
+      If the RM screwed up and some desperate last minute change to the
+      branch is necessary, it can mean extra work for Fred and Martin.
       So try to avoid this!
 
   ___ Log into irc.freenode.net and join the #python-dev channel.
@@ -389,7 +389,7 @@ How to Make A Release
       You should not see any "M" files, but you may see several "P" or
       "U" files.  I.e. you better not have any uncommitted changes in
       your working directory, but you may pick up some of Fred's or
-      Tim's last minute changes.
+      Martin's last minute changes.
 
   ___ If you've seen updates to existing files, update the cvs tag:
 
@@ -453,13 +453,6 @@ How to Make A Release
 
   ___ Upload the tgz file to creosote.python.org using scp.
 
-  ___ Tim has been having trouble uploading to creosote, so he will
-      usually put the file on SF, giving you the file name and the md5
-      checksum.  It's best to do a wget from creosote to SF, but
-      calculating the URL can be not-fun.  You can usually get the URL
-      from the file download page, if you start the download and then
-      immediately cancel it.
-
   ___ While you're waiting, you can start twiddling the web pages to
       include the announcement.
 
@@ -715,16 +708,17 @@ Final Release Notes
 
 Windows Notes
 
-    Windows has a GUI installer, various flavors of Windows have
+    Windows has a MSI installer, various flavors of Windows have
     "special limitations", and the Windows installer also packs
     precompiled "foreign" binaries (Tcl/Tk, expat, etc).  So Windows
     testing is tiresome but very necessary.
 
-    Concurrent with uploading the installer, Tim installs Python from
-    it twice: once into the default directory suggested by the
+    Concurrent with uploading the installer, Martin installs Python
+    from it twice: once into the default directory suggested by the
     installer, and later into a directory with embedded spaces in its
     name.  For each installation, he runs the full regression suite
-    from a DOS box, and both with and without -0.
+    from a DOS box, and both with and without -0. For maintenance
+    release, he also tests whether upgrade installations succeed.
 
     He also tries *every* shortcut created under Start -> Menu -> the
     Python group.  When trying IDLE this way, you need to verify that
@@ -740,9 +734,9 @@ Windows Notes
     only person routinely testing on Windows, and that Windows is
     simply a mess.
 
-    Repeat all of the above on at least one flavor of Win9x, and one
-    of NT/2000.  On NT/2000, try both an Admin and a plain User (not
-    Power User) account.
+    Repeat the testing for each target architecture.  On XP/2003, try
+    both an Admin and a plain User (not Power User) account. If you
+    can, also test the installer on Windows 9x.
 
     WRT Step 5 above (verify the release media), since by the time
     release files are ready to download Tim has generally run many