diff --git a/CHANGES.txt b/CHANGES.txt
index b11e8ae..30c5046 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,11 +12,15 @@ Next release
 
 - Updated Brazilian Portugese translations.
 
-- Updated Japanese translation.
+- Updated Japanese translations.
+
+- Updated Russian translations.
 
 - Fix documentation: 0.9.3 allowed explicitly passing None to DateTime
   to have no default timezone applied.
 
+- Add ``dev`` and ``docs`` setup.py aliases (e.g. ``python setup.py dev``).
+
 0.9.7 (2012-03-20)
 ------------------
 
diff --git a/setup.cfg b/setup.cfg
index b5ad85a..50ce659 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,6 +8,10 @@ nocapture=1
 cover-package=colander
 cover-erase=1
 
+[aliases]
+dev = develop easy_install colander[testing]
+docs = develop easy_install colander[docs]
+
 [compile_catalog]
 directory = colander/locale
 domain = colander
diff --git a/setup.py b/setup.py
index a6eaf69..5efd8e3 100644
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,9 @@ except:
 
 requires = ['translationstring']
 
+testing_extras = ['nose', 'coverage']
+docs_extras = ['Sphinx']
+
 setup(name='colander',
       version='0.9.7',
       description=('A simple schema-based serialization and deserialization '
@@ -52,8 +55,11 @@ setup(name='colander',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      tests_require = requires,
       install_requires = requires,
       test_suite="colander",
+      extras_require = {
+          'testing':testing_extras,
+          'docs':docs_extras,
+          },
       )