diff --git a/AUTHORS b/AUTHORS
index 4646e604..fdf97884 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,3 +4,4 @@ Monty Taylor <mordred@inaugust.com>
 Dean Troyer <dtroyer@gmail.com>
 Gabriel Hurley <gabriel@strikeawe.com>
 James E. Blair <jeblair@hp.com>
+Chuck Short <chuck.short@canonical.com>
diff --git a/setup.py b/setup.py
index b3e0a47b..a5f1d1d8 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
 import os
+import sys
 
 import setuptools
 
@@ -11,6 +12,9 @@ requires = parse_requirements()
 dependency_links = parse_dependency_links()
 write_git_changelog()
 
+if sys.version_info < (2, 6):
+    requires.append('simplejson')
+
 
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
diff --git a/tools/pip-requires b/tools/pip-requires
index e8bcd9d0..a52a4edf 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -1,6 +1,5 @@
 argparse
 httplib2
 prettytable
-simplejson
 
 -e git://github.com/openstack/python-keystoneclient.git#egg=python-keystoneclient