diff --git a/IPython/UserConfig/ipy_user_conf.py b/IPython/UserConfig/ipy_user_conf.py
index e3fae60..11958aa 100644
--- a/IPython/UserConfig/ipy_user_conf.py
+++ b/IPython/UserConfig/ipy_user_conf.py
@@ -6,9 +6,13 @@ This is a more flexible and safe way to configure ipython than *rc files
 This file is always imported on ipython startup. You should import all the
 ipython extensions you need here (see IPython/Extensions directory).
 
+Feel free to edit this file to customize your ipython experience. If 
+you wish to only use the old config system, it's perfectly ok to make this file 
+empty.
+
 """
 
-# see IPython.ipapi for configuration tips
+# Most of your config files and extensions will probably start with this import
 
 import IPython.ipapi as ip
 
@@ -23,18 +27,17 @@ if o.profile == 'pysh':
     # if you are doing shell-like stuff
     ip.ex("from IPython.path import path" )
     
-# get pysh-like prompt for all profiles. Comment these out for "old style"
-# prompts, as determined by *rc files
+# Uncomment these lines to get pysh-like prompt for all profiles. 
 
-o.prompt_in1= '\C_LightBlue[\C_LightCyan\Y1\C_LightBlue]\C_Green|\#> '
-o.prompt_in2= '\C_Green|\C_LightGreen\D\C_Green> '
-o.prompt_out= '<\#> '
+#o.prompt_in1= '\C_LightBlue[\C_LightCyan\Y1\C_LightBlue]\C_Green|\#> '
+#o.prompt_in2= '\C_Green|\C_LightGreen\D\C_Green> '
+#o.prompt_out= '<\#> '
 
 # make 'd' an alias for ls -F
 
 ip.magic('alias d ls -F --color=auto')
 
-# Make available all system commands. Comment out to speed up 
-# startup os slow machines and conserve a bit of memory
+# Make available all system commands. You can comment this line out to speed up 
+# startup on slow machines, and to conserve a bit of memory
 
 ip.magic('rehashx')
\ No newline at end of file
diff --git a/IPython/iplib.py b/IPython/iplib.py
index cfab762..31881b1 100644
--- a/IPython/iplib.py
+++ b/IPython/iplib.py
@@ -6,7 +6,7 @@ Requires Python 2.3 or newer.
 
 This file contains all the classes and helper functions specific to IPython.
 
-$Id: iplib.py 1032 2006-01-20 09:03:57Z fperez $
+$Id: iplib.py 1038 2006-01-20 23:43:35Z vivainio $
 """
 
 #*****************************************************************************
@@ -1099,7 +1099,14 @@ Successful installation!
 Please read the sections 'Initial Configuration' and 'Quick Tips' in the
 IPython manual (there are both HTML and PDF versions supplied with the
 distribution) to make sure that your system environment is properly configured
-to take advantage of IPython's features."""
+to take advantage of IPython's features.
+
+Important note: the configuration system has changed! The old system is
+still in place, but its setting may be partly overridden by the settings in 
+"~/.ipython/ipy_user_conf.py" config file. Please take a look at the file 
+if some of the new settings bother you. 
+
+"""
         else:
             print """
 Successful upgrade!
diff --git a/doc/ChangeLog b/doc/ChangeLog
index ecc68ba..f80b870 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -7,6 +7,11 @@
 	
 	* %store now complains when trying to store interactively declared
 	classes / instances of those classes.
+	
+	* Extensions/ipy_system_conf.py, UserConfig/ipy_user_conf.py,
+	ipmaker.py: Config rehaul. Now ipy_..._conf.py are always imported 
+	if they exist, and ipy_user_conf.py with some defaults is created for
+	the user.
 
 2006-01-20  Fernando Perez  <Fernando.Perez@colorado.edu>