diff --git a/IPython/UserConfig/ipy_profile_sh.py b/IPython/UserConfig/ipy_profile_sh.py
index 3722b2a..dd09d4e 100644
--- a/IPython/UserConfig/ipy_profile_sh.py
+++ b/IPython/UserConfig/ipy_profile_sh.py
@@ -32,6 +32,7 @@ def main():
     # beefed up %env is handy in shell mode
     import envpersist
     import ipy_which
+    import ipy_stock_completers
     
     
     ip.ex('import os')
diff --git a/IPython/UserConfig/ipy_user_conf.py b/IPython/UserConfig/ipy_user_conf.py
index e36655f..183a51c 100644
--- a/IPython/UserConfig/ipy_user_conf.py
+++ b/IPython/UserConfig/ipy_user_conf.py
@@ -27,7 +27,7 @@ ip = IPython.ipapi.get()
 def main():
     # Handy tab-completers for %cd, %run, import etc.
     # Try commenting this out if you have completion problems/slowness
-    import ipy_stock_completers
+    # import ipy_stock_completers
     
     # uncomment if you want to get ipython -p sh behaviour
     # without having to use command line switches
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f328793..6275c2f 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -6,6 +6,9 @@
 
 	* ipapi.py (expand_alias): Now actually *return* the expanded alias,
 	as opposed to returning nothing.
+	
+	* UserConfig/ipy_user_conf.py, ipy_profile_sh.py: do not import
+	ipy_stock_completers on default profile, do import on sh profile.
 
 2007-04-22  Jörgen Stenarson  <jorgen.stenarson@bostream.nu>