diff --git a/IPython/Extensions/ext_rehashdir.py b/IPython/Extensions/ext_rehashdir.py
index 455972d..c429995 100644
--- a/IPython/Extensions/ext_rehashdir.py
+++ b/IPython/Extensions/ext_rehashdir.py
@@ -98,7 +98,7 @@ def rehashdir_f(self,arg):
         self.shell.alias_table_validate()
         # Call again init_auto_alias() so we get 'rm -i' and other
         # modified aliases since %rehashx will probably clobber them
-        self.shell.init_auto_alias()
+        # self.shell.init_auto_alias()
     finally:
         os.chdir(savedir)
 ip.expose_magic("rehashdir",rehashdir_f)
diff --git a/IPython/UserConfig/ipy_profile_sh.py b/IPython/UserConfig/ipy_profile_sh.py
index 9968b4f..6f32af6 100644
--- a/IPython/UserConfig/ipy_profile_sh.py
+++ b/IPython/UserConfig/ipy_profile_sh.py
@@ -15,7 +15,7 @@ import os,textwrap
 
 import ipy_defaults
 
-def main():
+def main():    
     ip = ipapi.get()
     o = ip.options
     # autocall to "full" mode (smart mode is default, I like full mode)
@@ -29,6 +29,10 @@ def main():
     except ImportError:
         pass
     
+    # beefed up %env is handy in shell mode
+    import envpersist
+    
+    
     ip.ex('import os')
     ip.ex("def up(): os.chdir('..')")
         
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2574aac..b847ee1 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-14  Ville Vainio  <vivainio@gmail.com>
+
+	* Extensions/ext_rehashdir.py: Do not do auto_alias
+        in %rehashdir, it clobbers %store'd aliases.
+        
+        * UserConfig/ipy_profile_sh.py: envpersist.py extension
+        (beefed up %env) imported for sh profile.
+
 2007-03-10  Walter Doerwald  <walter@livinglogic.de>
 
 	* IPython/Extensions/ipipe.py: Prefer ibrowse over igrid