diff --git a/IPython/iplib.py b/IPython/iplib.py
index a779536..2b21be5 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 2719 2007-09-06 18:53:34Z vivainio $
+$Id: iplib.py 2725 2007-09-07 08:59:10Z vivainio $
 """
 
 #*****************************************************************************
@@ -571,7 +571,7 @@ class InteractiveShell(object,Magic):
                              )
             auto_alias = auto_alias + ls_extra
         elif os.name in ['nt','dos']:
-            auto_alias = ('dir dir /on', 'ls dir /on',
+            auto_alias = ('ls dir /on',
                           'ddir dir /ad /on', 'ldir dir /ad /on',
                           'mkdir mkdir','rmdir rmdir','echo echo',
                           'ren ren','cls cls','copy copy')
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 96e2d50..acf0ae0 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-07  Ville Vainio  <vivainio@gmail.com>
+
+	* iplib.py: do not auto-alias "dir", it screws up other dir auto
+        aliases.
+        
 2007-09-07  Fernando Perez  <Fernando.Perez@colorado.edu>
 
 	* IPython/OInspect.py (Inspector.pinfo): fixed bug that was