diff --git a/README.markdown b/README.markdown
--- a/README.markdown
+++ b/README.markdown
@@ -86,7 +86,13 @@
       (scion-flycheck-on-save 1))
 
     (add-hook 'haskell-mode-hook 'my-haskell-hook)
-    
+
+    ;; Use ido-mode completion (matches anywhere, not just beginning)
+    ;;
+    ;; WARNING: This causes some versions of Emacs to fail so badly
+    ;; that Emacs needs to be restarted.
+    (setq scion-completing-read-function 'ido-completing-read)
+
 Scion mode needs to communicate with the external server.  By default
 the server will be started automatically when needed.  See "Manually
 Connecting to Scion" below for how to connect to the server manually.
diff --git a/emacs/scion.el b/emacs/scion.el
--- a/emacs/scion.el
+++ b/emacs/scion.el
@@ -188,19 +188,24 @@
 
 (put 'slime-define-keys 'lisp-indent-function 1)
 
-(defun aquamacs-p ()
-  (string-match "Aquamacs" (emacs-version)))
+(defvar scion-completing-read-function 'completing-read
+  "The completion function used by scion.
 
+You might prefer `ido-completing-read' to the default, but that
+leads to problems on some versions of Emacs which are so severe
+that Emacs needs to be restarted. (You have been warned!)")
+
 (defun scion-completing-read (prompt collection &optional predicate require-match
 				     initial-input hist def inherit-input-method)
-  (cond
-   ;; for some reason ido-completing-read is broken in Aquamacs
-   ((not (aquamacs-p))
-    (ido-completing-read prompt collection predicate 
-			 require-match initial-input hist def))
-   (t
-    (completing-read  prompt collection predicate require-match initial-input
-		      hist def inherit-input-method))))
+  (if (eq scion-completing-read-function 'ido-completing-read)
+      ;; ido-completing-read does not support the last argument.  What
+      ;; a mess.
+      (funcall scion-completing-read-function 
+	   prompt collection predicate require-match initial-input
+	   hist def)
+    (funcall scion-completing-read-function 
+	   prompt collection predicate require-match initial-input
+	   hist def inherit-input-method)))
 
 ;;;---------------------------------------------------------------------------
 ;;;;;; Tree View Widget
diff --git a/scion.cabal b/scion.cabal
--- a/scion.cabal
+++ b/scion.cabal
@@ -1,5 +1,5 @@
 name:            scion
-version:         0.1
+version:         0.1.0.1
 license:         BSD3
 license-file:    LICENSE
 author:          Thomas Schilling <nominolo@googlemail.com>
@@ -12,9 +12,8 @@
   is based on the GHC API and Cabal.  It provides both a Haskell API and
   a server for non-Haskell clients such as Emacs and Vim.
   .
-  See the homepage (http://code.google.com/p/scion-lib/) and the
-  README
-  (http://github.com/nominolo/scion/blob/master/README.markdown) for
+  See the homepage <http://code.google.com/p/scion-lib> and the README
+  <http://github.com/nominolo/scion/blob/master/README.markdown> for
   more information.
 
 category:        Development