diff --git a/doc/ChangeLog b/doc/ChangeLog
index e6f0c39..9348686 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-09  Fernando Perez  <Fernando.Perez@colorado.edu>
+
+	* setup_bdist_egg.py: little script to build an egg.  Added
+	support in the release tools as well.
+
 2006-01-08  Fernando Perez  <Fernando.Perez@colorado.edu>
 
 	* IPython/Shell.py (IPShellWX.__init__): add support for WXPython
diff --git a/doc/manual_base.lyx b/doc/manual_base.lyx
index 74f0a9f..86fc24e 100644
--- a/doc/manual_base.lyx
+++ b/doc/manual_base.lyx
@@ -830,7 +830,7 @@ verb|  $ sudo pythonw setup.py install --install-scripts=/usr/local/bin|
 \newline 
 
 \begin_inset ERT
-status Open
+status Collapsed
 
 \layout Standard
 
@@ -2241,6 +2241,54 @@ Define your own macros with
 .
  This can be useful for automating sequences of expressions when working
  interactively.
+ You can edit a macro (they are just Python variables holding your input
+ as a string) by simply typing `
+\family typewriter 
+%edit macroname
+\family default 
+', and macros can be stored persistently across session with `
+\family typewriter 
+%store macroname
+\family default 
+' (the storage system is per-profile).
+ The combination of quick macros, persistent storage and editing, allows
+ you to easily refine quick-and-dirty interactive input into permanent utilities
+, always available both in IPython and as files for general reuse.
+\layout Itemize
+
+While 
+\family typewriter 
+%macro
+\family default 
+ saves input lines into memory for interactive re-execution, sometimes you'd
+ like to save your input directly to a file.
+ The 
+\family typewriter 
+%save
+\family default 
+ magic does this: its input sytnax is the same as 
+\family typewriter 
+%macro
+\family default 
+, but it saves your input directly to a Python file.
+ Note that the 
+\family typewriter 
+%logstart
+\family default 
+ command also saves input, but it logs 
+\emph on 
+all
+\emph default 
+ input to disk (though you can temporarily suspend it and reactivate it
+ with 
+\family typewriter 
+%logoff/%logon
+\family default 
+); 
+\family typewriter 
+%save
+\family default 
+ allows you to select which lines of input you need to save.
 \layout Itemize
 
 Define your own system aliases.
diff --git a/setup_bdist_egg.py b/setup_bdist_egg.py
new file mode 100755
index 0000000..f9a561a
--- /dev/null
+++ b/setup_bdist_egg.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+"""Simple wrapper to build IPython as an egg (setuptools format)."""
+
+import sys
+
+import pkg_resources
+pkg_resources.require("setuptools")
+import setuptools
+
+sys.argv=['','bdist_egg']
+execfile('setup.py')
diff --git a/tools/release b/tools/release
index 4ca7455..142c8d6 100755
--- a/tools/release
+++ b/tools/release
@@ -50,6 +50,10 @@ python2.3 ./setup.py bdist_rpm --release=py23 --python=/usr/bin/python2.3
 # lib/python2.4/...)
 python2.4 ./setup.py bdist_rpm --release=py24 --python=/usr/bin/python2.4
 
+# Build eggs
+python2.3 ./setup_bdist_egg.py
+python2.4 ./setup_bdist_egg.py
+
 # Call the windows build separately, so that the extra Windows scripts don't
 # get pulled into Unix builds (setup.py has code which checks for
 # bdist_wininst)
diff --git a/tools/testrel b/tools/testrel
index 75cd804..a2179fa 100755
--- a/tools/testrel
+++ b/tools/testrel
@@ -14,6 +14,10 @@ cd ~/ipython/ipython
 python2.3 ./setup.py bdist_rpm --release=py23 --python=/usr/bin/python2.3
 python2.4 ./setup.py bdist_rpm --release=py24 --python=/usr/bin/python2.4
 
+# Build eggs
+python2.3 ./setup_bdist_egg.py
+python2.4 ./setup_bdist_egg.py
+
 # Call the windows build separately, so that the extra Windows scripts don't
 # get pulled into Unix builds (setup.py has code which checks for
 # bdist_wininst)