diff --git a/IPython/core/release.py b/IPython/core/release.py
index 76c40c9..a2bef7f 100644
--- a/IPython/core/release.py
+++ b/IPython/core/release.py
@@ -26,6 +26,8 @@ _version_extra = 'dev'
 #_version_extra = 'rc1'
 # _version_extra = ''  # Uncomment this for full releases
 
+codename = 'An Afternoon Hack'
+
 # Construct full version string from these.
 _ver = [_version_major, _version_minor, _version_patch]
 
diff --git a/IPython/core/usage.py b/IPython/core/usage.py
index b7c5f5c..5c1cb7b 100644
--- a/IPython/core/usage.py
+++ b/IPython/core/usage.py
@@ -550,7 +550,9 @@ gui_note = """\
 default_banner_parts = [
     'Python %s\n' % (sys.version.split('\n')[0],),
     'Type "copyright", "credits" or "license" for more information.\n\n',
-    'IPython %s -- An enhanced Interactive Python.\n' % (release.version,),
+    'IPython {version} -- An enhanced Interactive Python.\n'.format(
+        version=release.version,
+        ),
     quick_guide
 ]
 
diff --git a/IPython/utils/sysinfo.py b/IPython/utils/sysinfo.py
index 5b7f8e5..98723df 100644
--- a/IPython/utils/sysinfo.py
+++ b/IPython/utils/sysinfo.py
@@ -82,6 +82,7 @@ def pkg_info(pkg_path):
     return dict(
         ipython_version=release.version,
         ipython_path=pkg_path,
+        codename=release.codename,
         commit_source=src,
         commit_hash=hsh,
         sys_version=sys.version,
diff --git a/docs/source/conf.py b/docs/source/conf.py
index f2b5349..dc90de7 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -89,9 +89,10 @@ github_project_url = "https://github.com/ipython/ipython"
 # other places throughout the built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = iprelease['version']
-# The short X.Y version.
-version = '.'.join(release.split('.',2)[:2])
+codename = iprelease['codename']
+release = "%s: %s" % (iprelease['version'], codename)
+# Just the X.Y.Z part, no '-dev'
+version = iprelease['version'].split('-', 1)[0]
 
 
 # There are two options for replacing |today|: either, you set today to some
diff --git a/docs/source/whatsnew/version1.0.rst b/docs/source/whatsnew/version1.0.rst
index 285a6aa..2a5c6e5 100644
--- a/docs/source/whatsnew/version1.0.rst
+++ b/docs/source/whatsnew/version1.0.rst
@@ -2,8 +2,9 @@
  1.0 Series
 ============
 
-Release 1.0
-===========
+Release 1.0.0: An Afternoon Hack
+================================
+
 
 IPython 1.0 requires Python ≥ 2.6.5 or ≥ 3.2.1.
 It does not support Python 3.0, 3.1, or 2.5.