diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ddc3ac17c..6471edbe4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+0.4.0-dev
+---------
+
+* Markdown < 2.0 is no longer supported.
+
 0.3.3
 -----
 
diff --git a/setup.py b/setup.py
index 5cd2a28fa..79bd73532 100755
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,9 @@ setup(
     package_data=get_package_data('djangorestframework'),
     test_suite='djangorestframework.runtests.runcoverage.main',
     install_requires=['URLObject>=0.6.0'],
+    extras_require={
+        'markdown': ["Markdown>=2.0"]
+    },
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',