diff --git a/IPython/Shell.py b/IPython/Shell.py
index aa88755..69d2062 100644
--- a/IPython/Shell.py
+++ b/IPython/Shell.py
@@ -1162,19 +1162,9 @@ def _select_shell(argv):
                 }
 
     all_opts = set(['tk','pylab','gthread','qthread','q4thread','wthread',
-                    'tkthread', 'twisted'])
+                    'tkthread'])
     user_opts = set([s.replace('-','') for s in argv[:3]])
-    special_opts = user_opts & all_opts
-
-    if 'twisted' in special_opts:
-        if sys.platform == 'win32':
-            import twshell
-            return twshell.IPShellTwisted
-        else:
-            error('-twisted currently only works on win32. Starting normal IPython.')
-            special_opts.remove('twisted')
-            return IPShell
-            
+    special_opts = user_opts & all_opts            
 
     if 'tk' in special_opts:
         USE_TK = True
diff --git a/IPython/ipmaker.py b/IPython/ipmaker.py
index 64ef629..8652c50 100644
--- a/IPython/ipmaker.py
+++ b/IPython/ipmaker.py
@@ -189,7 +189,8 @@ object?   -> Details about 'object'. ?object also works, ?? prints more.
     
     cmdline_only = ('help interact|i ipythondir=s Version upgrade '
                     'gthread! qthread! q4thread! wthread! tkthread! pylab! tk! '
-                    'twisted!')
+                    # 'twisted!'  # disabled for now.
+                    )
 
     # Build the actual name list to be used by DPyGetOpt
     opts_names = qw(cmdline_opts) + qw(cmdline_only)
@@ -247,7 +248,7 @@ object?   -> Details about 'object'. ?object also works, ?? prints more.
                       system_verbose = 0,
                       term_title = 1,
                       tk = 0,
-                      twisted= 0,
+                      #twisted= 0,  # disabled for now
                       upgrade = 0,
                       Version = 0,
                       wildcards_case_sensitive = 1,
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 51112b1..e1654fe 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,17 @@
+2008-05-31  Fernando Perez  <Fernando.Perez@berkeley.edu>
+
+	* IPython/ipmaker.py (make_IPython): The -twisted option is fully
+	disabled.
+
+	* IPython/Shell.py (_select_shell): completely disable -twisted.
+	This code is of dubious quality and  normal users should not
+	encounter it until we can clarify things further, even under
+	win32.  Since we need a quick emergency 0.8.4 release, it is now
+	disabled completely.  Users who want to run it can use the
+	following command (it's easy to put it in an alias or script):
+	
+	python -c"from IPython import twshell;twshell.IPShellTwisted().mainloop()"
+
 2008-05-30  Ville Vainio <vivainio@gmail.com>
 
 	* shell.py: disable -twisted on non-win32 platforms.