diff --git a/IPython/Shell.py b/IPython/Shell.py
index 3666c76..1bff3fc 100644
--- a/IPython/Shell.py
+++ b/IPython/Shell.py
@@ -4,7 +4,7 @@
 All the matplotlib support code was co-developed with John Hunter,
 matplotlib's author.
 
-$Id: Shell.py 3006 2008-02-01 18:00:26Z fperez $"""
+$Id: Shell.py 3024 2008-02-07 15:34:42Z darren.dale $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
@@ -982,6 +982,12 @@ class IPShellQt4(IPThread):
 
         from PyQt4 import QtCore, QtGui
 
+        try:
+            # present in PyQt4-4.2.1 or later
+            QtCore.pyqtRemoveInputHook()
+        except AttributeError:
+            pass
+
         if QtCore.PYQT_VERSION_STR == '4.3':
             warn('''PyQt4 version 4.3 detected.
 If you experience repeated threading warnings, please update PyQt4.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index cff94b6..293f46d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-07  Darren Dale <darren.dale@cornell.edu>
+
+        * IPython/Shell.py: Call QtCore.pyqtRemoveInputHook() when creating
+        an IPShellQt4. PyQt4-4.2.1 and later uses PyOS_InputHook to improve 
+        interaction in the interpreter (like Tkinter does), but it seems to 
+        partially interfere with the IPython implementation and exec_()
+        still seems to block. So we disable the PyQt implementation and
+        stick with the IPython one for now.
+
 2008-02-02  Walter Doerwald  <walter@livinglogic.de>
 
 	* ipipe.py: A new ipipe table has been added: ialias produces all