diff --git a/IPython/__init__.py b/IPython/__init__.py
index 0f7b866..8dcab7c 100755
--- a/IPython/__init__.py
+++ b/IPython/__init__.py
@@ -24,6 +24,7 @@ import sys
 # Setup everything
 #-----------------------------------------------------------------------------
 
+# Don't forget to also update setup.py when this changes!
 if sys.version[0:3] < '2.6':
     raise ImportError('Python Version 2.6 or above is required for IPython.')
 
diff --git a/setup.py b/setup.py
index 1284732..834cb5f 100755
--- a/setup.py
+++ b/setup.py
@@ -21,14 +21,14 @@ import sys
 
 # This check is also made in IPython/__init__, don't forget to update both when
 # changing Python version requirements.
-if sys.version[0:3] < '2.5':
+if sys.version[0:3] < '2.6':
     error = """\
-ERROR: 'IPython requires Python Version 2.5 or above.'
+ERROR: 'IPython requires Python Version 2.6 or above.'
 Exiting."""
     print >> sys.stderr, error
     sys.exit(1)
 
-# At least we're on Python 2.5 or newer, move on.
+# At least we're on the python version we need, move on.
 
 #-------------------------------------------------------------------------------
 # Imports