diff --git a/IPython/Extensions/ipy_defaults.py b/IPython/Extensions/ipy_defaults.py
index 5b7e8a4..9559cfd 100644
--- a/IPython/Extensions/ipy_defaults.py
+++ b/IPython/Extensions/ipy_defaults.py
@@ -53,7 +53,8 @@ set show-all-if-ambiguous on
 "\C-k": kill-line
 "\C-u": unix-line-discard"""
 
-for cmd in rlopts.split('\n'):
-    readline.parse_and_bind(cmd)
+if readline.have_readline:
+    for cmd in rlopts.split('\n'):
+        readline.parse_and_bind(cmd)
     
     
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7b7b63c..97549a4 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-02  Jörgen Stenarson  <jorgen.stenarson@bostream.nu>
+
+	* IPython/Extensions/ipy_defaults.py: Check if readline is available
+	before calling functions from readline.
+
 2007-03-02  Walter Doerwald  <walter@livinglogic.de>
 
 	* IPython/Extensions/igrid.py: Add Nik Tautenhahns igrid extension.