diff --git a/IPython/Magic.py b/IPython/Magic.py
index e8bf6aa..91aab14 100644
--- a/IPython/Magic.py
+++ b/IPython/Magic.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Magic functions for InteractiveShell.
 
-$Id: Magic.py 990 2006-01-04 06:59:02Z fperez $"""
+$Id: Magic.py 991 2006-01-04 18:15:34Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
@@ -2286,7 +2286,7 @@ Defaulting color scheme to 'NoColor'"""
             else:
                 if bkms:
                     error("Bookmark '%s' not found.  "
-                          "Use '%bookmark -l' to see your bookmarks." % ps)
+                          "Use '%%bookmark -l' to see your bookmarks." % ps)
                 else:
                     print "Bookmarks not set - use %bookmark <bookmarkname>"
                 return
diff --git a/doc/ChangeLog b/doc/ChangeLog
index b171f1a..aea95da 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-04  Fernando Perez  <Fernando.Perez@colorado.edu>
+
+	* IPython/Magic.py (magic_cd): fix crash when cd -b was used.
+	Ville's patch.
+
 2006-01-03  Fernando Perez  <Fernando.Perez@colorado.edu>
 
 	* IPython/iplib.py (handle_auto): changed autocall semantics to