diff --git "a/Mac/Distributions/\050vise\051/Python 2.1.vct" "b/Mac/Distributions/\050vise\051/Python 2.1.vct"
index f83c347..716d516 100644
--- "a/Mac/Distributions/\050vise\051/Python 2.1.vct"
+++ "b/Mac/Distributions/\050vise\051/Python 2.1.vct"
Binary files differ
diff --git a/Mac/Distributions/binary.exclude b/Mac/Distributions/binary.exclude
index 32586d2..65e6c4f 100644
--- a/Mac/Distributions/binary.exclude
+++ b/Mac/Distributions/binary.exclude
@@ -13,6 +13,9 @@
 *.idb
 *.jack
 *.lib
+*.mcp
+*.mcp.exp
+*.mcp.xml
 *.orig
 *.prj
 *.prj.exp
@@ -30,6 +33,3 @@
 Makefile*
 Setup.in
 [(]*[)]
-*.mcp
-*.mcp.exp
-*.mcp.xml
diff --git a/Mac/Distributions/binary.include b/Mac/Distributions/binary.include
index 60f19dd..b75de1d 100644
--- a/Mac/Distributions/binary.include
+++ b/Mac/Distributions/binary.include
@@ -1,8 +1,8 @@
 (':.DS_Store', None)
 (':BeOS', None)
-(':BuildApplet', '')
-(':BuildApplication', '')
-(':ConfigurePython', '')
+(':BuildApplet', None)
+(':BuildApplication', None)
+(':ConfigurePython', None)
 (':Demo', '')
 (':Demo:cwilib', None)
 (':Demo:embed', None)
@@ -12,12 +12,54 @@
 (':Demo:stdwin', None)
 (':Demo:www', None)
 (':Doc', None)
-(':EditPythonPrefs', '')
+(':EditPythonPrefs', None)
 (':Extensions:4Suite-0.9.2', None)
 (':Extensions:Icon', None)
 (':Extensions:Imaging', '')
 (':Extensions:Imaging:Tk', None)
 (':Extensions:Imaging:libImaging', None)
+(':Extensions:Numerical:DEVELOPERS', '')
+(':Extensions:Numerical:Demo', '')
+(':Extensions:Numerical:Legal.htm', '')
+(':Extensions:Numerical:Lib', '')
+(':Extensions:Numerical:MANIFEST', '')
+(':Extensions:Numerical:Mac', None)
+(':Extensions:Numerical:Packages:FFT:Lib', '')
+(':Extensions:Numerical:Packages:FFT:Mac:Icon\r', None)
+(':Extensions:Numerical:Packages:FFT:Src:fftpack.def', None)
+(':Extensions:Numerical:Packages:FFT:build', None)
+(':Extensions:Numerical:Packages:FFT:setup.py', None)
+(':Extensions:Numerical:Packages:LALITE:Lib', '')
+(':Extensions:Numerical:Packages:LALITE:Mac:Icon\r', None)
+(':Extensions:Numerical:Packages:LALITE:README', '')
+(':Extensions:Numerical:Packages:LALITE:Src:lapack_lite.def', None)
+(':Extensions:Numerical:Packages:LALITE:build', None)
+(':Extensions:Numerical:Packages:LALITE:setup.py', None)
+(':Extensions:Numerical:Packages:MA:Demo', '')
+(':Extensions:Numerical:Packages:MA:Legal.htm', '')
+(':Extensions:Numerical:Packages:MA:Lib', '')
+(':Extensions:Numerical:Packages:MA:Test:test.py', '')
+(':Extensions:Numerical:Packages:MA:build', None)
+(':Extensions:Numerical:Packages:MA:setup.py', None)
+(':Extensions:Numerical:Packages:RANLIB:Lib', '')
+(':Extensions:Numerical:Packages:RANLIB:Mac:Icon\r', None)
+(':Extensions:Numerical:Packages:RANLIB:README', '')
+(':Extensions:Numerical:Packages:RANLIB:Src:ranlib.def', None)
+(':Extensions:Numerical:Packages:RANLIB:build', None)
+(':Extensions:Numerical:Packages:RANLIB:setup.py', None)
+(':Extensions:Numerical:Packages:RNG:Legal.htm', '')
+(':Extensions:Numerical:Packages:RNG:Lib', '')
+(':Extensions:Numerical:Packages:RNG:Mac:Icon\r', None)
+(':Extensions:Numerical:Packages:RNG:README', '')
+(':Extensions:Numerical:Packages:RNG:Test', '')
+(':Extensions:Numerical:Packages:RNG:build', None)
+(':Extensions:Numerical:Packages:RNG:setup.py', None)
+(':Extensions:Numerical:README', '')
+(':Extensions:Numerical:Src', None)
+(':Extensions:Numerical:Test', '')
+(':Extensions:Numerical:build', None)
+(':Extensions:Numerical:setup.py', None)
+(':Extensions:Numerical:setup_all.py', None)
 (':Extensions:Pmw', None)
 (':Extensions:PyDOM', None)
 (':Extensions:PyOpenGL-1.5.6a2', None)
@@ -26,6 +68,29 @@
 (':Extensions:README.TOO', None)
 (':Extensions:audio', None)
 (':Extensions:img:Lib', '')
+(':Extensions:img:Mac:genimgprojects.py', None)
+(':Extensions:img:Mac:imgcolormap.carbon.slb', '')
+(':Extensions:img:Mac:imgcolormap.ppc.slb', '')
+(':Extensions:img:Mac:imgformat.carbon.slb', '')
+(':Extensions:img:Mac:imgformat.ppc.slb', '')
+(':Extensions:img:Mac:imggif.carbon.slb', '')
+(':Extensions:img:Mac:imggif.ppc.slb', '')
+(':Extensions:img:Mac:imgjpeg.carbon.slb', '')
+(':Extensions:img:Mac:imgjpeg.ppc.slb', '')
+(':Extensions:img:Mac:imgop.carbon.slb', '')
+(':Extensions:img:Mac:imgop.ppc.slb', '')
+(':Extensions:img:Mac:imgpbm.carbon.slb', '')
+(':Extensions:img:Mac:imgpbm.ppc.slb', '')
+(':Extensions:img:Mac:imgpgm.carbon.slb', '')
+(':Extensions:img:Mac:imgpgm.ppc.slb', '')
+(':Extensions:img:Mac:imgpng.carbon.slb', '')
+(':Extensions:img:Mac:imgpng.ppc.slb', '')
+(':Extensions:img:Mac:imgppm.carbon.slb', '')
+(':Extensions:img:Mac:imgppm.ppc.slb', '')
+(':Extensions:img:Mac:imgsgi.carbon.slb', '')
+(':Extensions:img:Mac:imgsgi.ppc.slb', '')
+(':Extensions:img:Mac:imgtiff.carbon.slb', '')
+(':Extensions:img:Mac:imgtiff.ppc.slb', '')
 (':Extensions:img:README.img', '')
 (':Extensions:img:doc', None)
 (':Extensions:img:test', '')
@@ -137,14 +202,14 @@
 (':PC', None)
 (':PCbuild', None)
 (':Parser:Icon', None)
-(':Python IDE', '')
+(':Python IDE', None)
 (':Python:Icon', None)
 (':PythonCarbonStandalone', None)
 (':PythonCore', '')
 (':PythonCoreCarbon', '')
-(':PythonInterpreter', '')
-(':PythonInterpreterCarbon', None)
-(':PythonInterpreterClassic', None)
+(':PythonInterpreter', None)
+(':PythonInterpreterCarbon', '')
+(':PythonInterpreterClassic', '')
 (':PythonStandCarbon', None)
 (':PythonStandSmall', None)
 (':PythonStandSmallCarbon', None)
@@ -179,68 +244,7 @@
 (':pystone.py', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Extensions:img:Mac:genimgprojects.py', None)
-(':Extensions:img:Mac:imgcolormap.carbon.slb', '')
-(':Extensions:img:Mac:imgcolormap.ppc.slb', '')
-(':Extensions:img:Mac:imgformat.carbon.slb', '')
-(':Extensions:img:Mac:imgformat.ppc.slb', '')
-(':Extensions:img:Mac:imggif.carbon.slb', '')
-(':Extensions:img:Mac:imggif.ppc.slb', '')
-(':Extensions:img:Mac:imgjpeg.carbon.slb', '')
-(':Extensions:img:Mac:imgjpeg.ppc.slb', '')
-(':Extensions:img:Mac:imgop.carbon.slb', '')
-(':Extensions:img:Mac:imgop.ppc.slb', '')
-(':Extensions:img:Mac:imgpbm.carbon.slb', '')
-(':Extensions:img:Mac:imgpbm.ppc.slb', '')
-(':Extensions:img:Mac:imgpgm.carbon.slb', '')
-(':Extensions:img:Mac:imgpgm.ppc.slb', '')
-(':Extensions:img:Mac:imgpng.carbon.slb', '')
-(':Extensions:img:Mac:imgpng.ppc.slb', '')
-(':Extensions:img:Mac:imgppm.carbon.slb', '')
-(':Extensions:img:Mac:imgppm.ppc.slb', '')
-(':Extensions:img:Mac:imgsgi.carbon.slb', '')
-(':Extensions:img:Mac:imgsgi.ppc.slb', '')
-(':Extensions:img:Mac:imgtiff.carbon.slb', '')
-(':Extensions:img:Mac:imgtiff.ppc.slb', '')
-(':Extensions:Numerical:Legal.htm', '')
-(':Extensions:Numerical:DEVELOPERS', '')
-(':Extensions:Numerical:MANIFEST', '')
-(':Extensions:Numerical:README', '')
-(':Extensions:Numerical:setup_all.py', None)
-(':Extensions:Numerical:setup.py', None)
-(':Extensions:Numerical:build', None)
-(':Extensions:Numerical:Demo', '')
-(':Extensions:Numerical:Lib', '')
-(':Extensions:Numerical:Mac', None)
-(':Extensions:Numerical:Packages:FFT:setup.py', None)
-(':Extensions:Numerical:Packages:FFT:build', None)
-(':Extensions:Numerical:Packages:FFT:Lib', '')
-(':Extensions:Numerical:Packages:FFT:Mac:Icon\r', None)
-(':Extensions:Numerical:Packages:LALITE:build', None)
-(':Extensions:Numerical:Packages:LALITE:Lib', '')
-(':Extensions:Numerical:Packages:FFT:Src:fftpack.def', None)
-(':Extensions:Numerical:Packages:LALITE:Mac:Icon\r', None)
-(':Extensions:Numerical:Packages:MA:build', None)
-(':Extensions:Numerical:Packages:LALITE:Src:lapack_lite.def', None)
-(':Extensions:Numerical:Packages:LALITE:setup.py', None)
-(':Extensions:Numerical:Packages:LALITE:README', '')
-(':Extensions:Numerical:Packages:MA:Legal.htm', '')
-(':Extensions:Numerical:Packages:MA:setup.py', None)
-(':Extensions:Numerical:Packages:MA:Demo', '')
-(':Extensions:Numerical:Packages:MA:Lib', '')
-(':Extensions:Numerical:Packages:RANLIB:build', None)
-(':Extensions:Numerical:Packages:MA:Test:test.py', '')
-(':Extensions:Numerical:Packages:RANLIB:setup.py', None)
-(':Extensions:Numerical:Packages:RANLIB:Lib', '')
-(':Extensions:Numerical:Packages:RANLIB:Mac:Icon\r', None)
-(':Extensions:Numerical:Packages:RANLIB:Src:ranlib.def', None)
-(':Extensions:Numerical:Packages:RNG:Legal.htm', '')
-(':Extensions:Numerical:Packages:RNG:README', '')
-(':Extensions:Numerical:Packages:RNG:setup.py', None)
-(':Extensions:Numerical:Packages:RNG:build', None)
-(':Extensions:Numerical:Packages:RANLIB:README', '')
-(':Extensions:Numerical:Packages:RNG:Lib', '')
-(':Extensions:Numerical:Packages:RNG:Mac:Icon\r', None)
-(':Extensions:Numerical:Packages:RNG:Test', '')
-(':Extensions:Numerical:Src', None)
-(':Extensions:Numerical:Test', '')
+(':Mac:OSX:README.macosx.txt', None)
+(':Extensions:Numerical:Packages:MA:changes.txt', None)
+(':ConfigurePythonCarbon', '')
+(':ConfigurePythonClassic', '')
diff --git a/Mac/Distributions/dev.include b/Mac/Distributions/dev.include
index bd755d1..4f53f5e 100644
--- a/Mac/Distributions/dev.include
+++ b/Mac/Distributions/dev.include
@@ -298,10 +298,13 @@
 (':Modules:Setup.in', None)
 (':Modules:Setup.thread.in', None)
 (':Modules:_codecsmodule.c', None)
+(':Modules:_curses_panel.c', None)
 (':Modules:_cursesmodule.c', None)
 (':Modules:_localemodule.c', None)
 (':Modules:_sre.c', None)
+(':Modules:_testcapimodule.c', None)
 (':Modules:_tkinter.c', None)
+(':Modules:_weakref.c', None)
 (':Modules:almodule.c', None)
 (':Modules:arraymodule.c', None)
 (':Modules:audioop.c', None)
@@ -380,6 +383,7 @@
 (':Modules:structmodule.c', None)
 (':Modules:sunaudiodev.c', None)
 (':Modules:svmodule.c', None)
+(':Modules:symtablemodule.c', None)
 (':Modules:syslogmodule.c', None)
 (':Modules:tclNotify.c', None)
 (':Modules:termios.c', None)
@@ -390,8 +394,11 @@
 (':Modules:tkappinit.c', None)
 (':Modules:ucnhash.c', None)
 (':Modules:unicodedata.c', None)
+(':Modules:unicodedata_db.h', None)
 (':Modules:unicodedatabase.c', None)
 (':Modules:unicodedatabase.h', None)
+(':Modules:unicodename_db.h', None)
+(':Modules:xreadlinesmodule.c', None)
 (':Modules:xxmodule.c', '')
 (':Modules:yuv.h', None)
 (':Modules:yuvconvert.c', None)
@@ -447,10 +454,8 @@
 (':readmefiles', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Modules:symtablemodule.c', None)
-(':Modules:_weakref.c', None)
-(':Modules:_testcapimodule.c', None)
-(':Modules:_curses_panel.c', None)
-(':Modules:xreadlinesmodule.c', None)
-(':Modules:unicodename_db.h', None)
-(':Modules:unicodedata_db.h', None)
+(':ConfigurePythonClassic', None)
+(':ConfigurePythonCarbon', None)
+(':Modules:ld_so_beos', None)
+(':Modules:ar_beos', None)
+(':Mac:OSX:README.macosx.txt', None)
diff --git a/Mac/ReadMe b/Mac/ReadMe
index c426979..ec8660e 100644
--- a/Mac/ReadMe
+++ b/Mac/ReadMe
@@ -1,10 +1,11 @@
-How to install Python 2.1a2 on your Macintosh
+How to install Python 2.1a3 on your Macintosh
 ---------------------------------------------
 
 Note that this is really an alpha: it is only lightly tested and contains a lot
-of new code. Moreover, this release is Carbon only, so it will run on MacOS 8.6
+of new code. Moreover, this release is Carbon only, so it will run on MacOS 8.1
 or later and MacOS X. The next alpha will again run in "classic MacOS" (8.0 or
-later).
+later). For MacOS 8.1 through 8.6 you will have to install CarbonLib (version 1.0.4
+or later) yourself from the Apple website.
 
 I'm hoping for a fairly quick alpha cycle, with about 3 distributions in quick
 succession, so please give feedback (to pythonmac-sig@python.org) as soon as
@@ -111,7 +112,7 @@
 
 Two items are installed in the system folder: the interpreter shared
 libraries PythonCore and PythonCoreCarbon lives in the Extensions folder and the
-"Python 2.1a2 Preferences" file in the Python subfolder in the
+"Python 2.1a3 Preferences" file in the Python subfolder in the
 Preferences folder. All the rest of Python lives in the folder you
 installed in.
 
diff --git a/Mac/Relnotes b/Mac/Relnotes
index 99f9556..1047fdd 100644
--- a/Mac/Relnotes
+++ b/Mac/Relnotes
@@ -1,12 +1,10 @@
-Changes in 2.1a2 since 2.0
+Changes in 2.1a3 since 2.0
 --------------------------
 
 These release notes refer to Mac-specific changes only. See NEWS (in the Misc folder)
-for machine-independent changes.
-
-Unfortunately I have messed my administration up, so I can't give complete
-Mac-specific release notes for the changes in this release. So, I will
-have to leave it at the highlights:
+for machine-independent changes. Changes since previous alfa/beta releases for 2.1 are
+marked with [*] and at the bottom of the list. Note that 2.1a3 is a Mac-only release.
+The machine-independent stuff is at a state somewhere between 2.1a2 and 2.1b1.
 
 - The good news: this release is Carbon-based, so it runs natively on MacOS 8.6 or
   later and MacOSX.
@@ -52,6 +50,16 @@
   with :Mac:scripts:genpluginprojects.py (also called by fullbuild). The .mcp files
   are not in the repository, if you don't want to use genpluginprojects you can import
   the .mcp.xml files in CodeWarrior.
+- ConfigurePython has been replace by two applets: ConfigurePythonClassic and
+  ConfigurePythonCarbon. These will select either execution model for machines
+  supporting both, and it will also build all the standard applets. [*]
+- Dlg.ModalDialog() almost invariably crashed. This showed in EasyDialogs, EditPythonPrefs
+  and meny other things. Fixed. [*]
+- Carbon MacPython did not work with CarbonLib 1.1 or later. Fixed. [*]
+- IDE flashed a window and complained about it. Fixed, by getting rid of regex in
+  favor of re. Code not fully tested. [*]
+- IDE could crash on some edit operations due to WEGetUndoInfo(). Fixed. [*]
+- time.time() again returns positive values. [*]
 
 
 What is not in this distribution