diff --git a/IPython/ipmaker.py b/IPython/ipmaker.py
index 77825bc..d050579 100644
--- a/IPython/ipmaker.py
+++ b/IPython/ipmaker.py
@@ -6,7 +6,7 @@ Requires Python 2.1 or better.
 
 This file contains the main make_IPython() starter function.
 
-$Id: ipmaker.py 2036 2007-01-27 07:30:22Z fperez $"""
+$Id: ipmaker.py 2093 2007-02-09 21:28:58Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
@@ -20,17 +20,22 @@ __author__  = '%s <%s>' % Release.authors['Fernando']
 __license__ = Release.license
 __version__ = Release.version
 
-credits._Printer__data = """
-Python: %s
+try:
+    credits._Printer__data = """
+    Python: %s
 
-IPython: Fernando Perez, Janko Hauser, Nathan Gray, and many users.
-See http://ipython.scipy.org for more information.""" \
-% credits._Printer__data
+    IPython: Fernando Perez, Janko Hauser, Nathan Gray, and many users.
+    See http://ipython.scipy.org for more information.""" \
+    % credits._Printer__data
 
-copyright._Printer__data += """
+    copyright._Printer__data += """
 
-Copyright (c) 2001-2004 Fernando Perez, Janko Hauser, Nathan Gray.
-All Rights Reserved."""
+    Copyright (c) 2001-2004 Fernando Perez, Janko Hauser, Nathan Gray.
+    All Rights Reserved."""
+except NameError:
+    # Can happen if ipython was started with 'python -S', so that site.py is
+    # not loaded
+    pass
 
 #****************************************************************************
 # Required modules