diff --git a/IPython/Extensions/ipy_system_conf.py b/IPython/Extensions/ipy_system_conf.py
index 0de956d..aabbd56 100644
--- a/IPython/Extensions/ipy_system_conf.py
+++ b/IPython/Extensions/ipy_system_conf.py
@@ -7,7 +7,8 @@ should reside there.
 
  """
 
-import IPython.ipapi as ip
+import IPython.ipapi
+ip = IPython.ipapi.get()
 
 # add system wide configuration information, import extensions etc. here.
 # nothing here is essential 
@@ -16,4 +17,8 @@ import sys
 
 import ext_rehashdir # %rehashdir magic
 import ext_rescapture # var = !ls and var = %magic
-import pspersistence # %store magic
\ No newline at end of file
+import pspersistence # %store magic
+
+# Basic readline config
+
+o = ip.options()
\ No newline at end of file
diff --git a/IPython/ipmaker.py b/IPython/ipmaker.py
index 657b6a9..744cfe4 100644
--- a/IPython/ipmaker.py
+++ b/IPython/ipmaker.py
@@ -6,7 +6,7 @@ Requires Python 2.1 or better.
 
 This file contains the main make_IPython() starter function.
 
-$Id: ipmaker.py 1140 2006-02-10 17:07:11Z vivainio $"""
+$Id: ipmaker.py 1213 2006-03-16 13:45:11Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
@@ -616,7 +616,7 @@ object? -> Details about 'object'. ?object also works, ?? prints more.
         except ImportError:
             # only warn if ipythonrc-PROFNAME didn't exist
             if opts.profile =='':
-                warn("Could not start with profile '%s'!\n ('%s/%s.py' does not exist?)" % (
+                warn("Could not start with profile '%s'!\n ('%s/%s.py' does not exist? run '%%upgrade')" % (
                       opts_all.profile, ipythondir, profmodname)
 
                       )
@@ -624,7 +624,7 @@ object? -> Details about 'object'. ?object also works, ?? prints more.
         import ipy_user_conf
     except ImportError:
         if opts_all.debug:  IP.InteractiveTB()
-        warn("Could not import user config!\n ('%s/ipy_user_conf.py' does not exist?)" % 
+        warn("Could not import user config!\n ('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n" %
             ipythondir)
 
     # release stdout and stderr and save config log into a global summary
diff --git a/IPython/upgrade_dir.py b/IPython/upgrade_dir.py
index 47fb46f..6bc1f8b 100644
--- a/IPython/upgrade_dir.py
+++ b/IPython/upgrade_dir.py
@@ -6,7 +6,7 @@ new and unedited files.
 
 To be used by "upgrade" feature.
 """
-from path import path
+from IPython.Extensions.path import path
 import md5,pickle
 
 def showdiff(old,new):
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 01ed4d1..4c05bde 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-16  Ville Vainio  <vivainio@gmail.com>
+
+	* upgrade_dir.py: Take path.py from Extensions, correcting
+	%upgrade magic
+	
+	* Suggest using %upgrade if ipy_user_conf.py isn't found.
+
 2006-03-13  Fernando Perez  <Fernando.Perez@colorado.edu>
 
 	* Manual: thanks to a tip on proper color handling for Emacs, by