diff --git a/doc/ipython.el b/doc/ipython.el
index b90b4de..f7edaee 100644
--- a/doc/ipython.el
+++ b/doc/ipython.el
@@ -6,7 +6,7 @@
 ;; URL:           http://ipython.scipy.org
 ;; Compatibility: Emacs21, XEmacs21
 ;; FIXME: #$@! INPUT RING
-(defconst ipython-version "$Revision: 2154 $"
+(defconst ipython-version "$Revision: 2232 $"
   "VC version number.")
 
 ;;; Commentary 
@@ -175,6 +175,9 @@ the second for a 'normal' command, and the third for a multiline command.")
 
       (ansi-color-for-comint-mode-on)
       (define-key py-shell-map [tab] 'ipython-complete)
+      ;; Add this so that tab-completion works both in X11 frames and inside
+      ;; terminals (such as when emacs is called with -nw).
+      (define-key py-shell-map "\t" 'ipython-complete)
       ;;XXX this is really just a cheap hack, it only completes symbols in the
       ;;interactive session -- useful nonetheless.
       (define-key py-mode-map [(meta tab)] 'ipython-complete)