diff --git a/IPython/iplib.py b/IPython/iplib.py
index bab98b1..bfdf81a 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 1356 2006-06-07 23:51:05Z fperez $
+$Id: iplib.py 1357 2006-06-08 12:15:46Z vivainio $
 """
 
 #*****************************************************************************
@@ -666,12 +666,16 @@ class InteractiveShell(object,Magic):
             self.magic_alias(alias)
         self.hooks.late_startup_hook()
         
+        batchrun = False
         for batchfile in [path(arg) for arg in self.rc.args 
             if arg.lower().endswith('.ipy')]:
             if not batchfile.isfile():
                 print "No such batch file:", batchfile
                 continue
             self.api.runlines(batchfile.text())
+            batchrun = True
+        if batchrun:
+            self.exit_now = True            
 
     def add_builtins(self):
         """Store ipython references into the builtin namespace.
@@ -1470,6 +1474,10 @@ want to merge them back into the new files.""" % locals()
         close!).
 
         """
+        
+        if self.exit_now:
+            # batch run -> do not interact
+            return
         cprt = 'Type "copyright", "credits" or "license" for more information.'
         if banner is None:
             self.write("Python %s on %s\n%s\n(%s)\n" %
@@ -1484,7 +1492,6 @@ want to merge them back into the new files.""" % locals()
         __builtin__.__dict__['__IPYTHON__active'] += 1
 
         # exit_now is set by a call to %Exit or %Quit
-        self.exit_now = False
         while not self.exit_now:
             if more:
                 prompt = self.outputcache.prompt2
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d36d70e..65b8227 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-07  Ville Vainio  <vivainio@gmail.com>
+
+	* iplib.py: ipython mybatch.ipy exits ipython immediately after
+	running the batch files instead of leaving the session open.
+
 2006-06-07  Fernando Perez  <Fernando.Perez@colorado.edu>
 
 	* IPython/iplib.py (InteractiveShell.__init__): update BSD fix, as