diff --git a/docs/install.rst b/docs/install.rst
index 571de95e..2da7b9be 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -9,6 +9,10 @@ You can install Pelican via several different methods. The simplest is via
 
     pip install pelican
 
+Or, if you plan on using Markdown::
+
+    pip install pelican[Markdown]
+
 (Keep in mind that operating systems will often require you to prefix the above
 command with ``sudo`` in order to install Pelican system-wide.)
 
@@ -40,7 +44,11 @@ Optional packages
 -----------------
 
 If you plan on using `Markdown <http://pypi.python.org/pypi/Markdown>`_ as a
-markup format, you'll need to install the Markdown library::
+markup format, you can install Pelican with Markdown support::
+
+   pip install pelican[Markdown]
+
+Or you might need to install it a posteriori::
 
     pip install Markdown
 
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 646dd987..484a318f 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -11,7 +11,7 @@ Install Pelican (and optionally Markdown if you intend to use it) on Python
 2.7.x or Python 3.5+ by running the following command in your preferred
 terminal, prefixing with ``sudo`` if permissions warrant::
 
-    pip install pelican markdown
+    pip install pelican[Markdown]
 
 Create a project
 ----------------
diff --git a/setup.py b/setup.py
index 5eea85b6..0979d1c4 100755
--- a/setup.py
+++ b/setup.py
@@ -61,6 +61,9 @@ setup(
                           for name in names],
     },
     install_requires=requires,
+    extras_require={
+        'Markdown': ['markdown~=3.1.1']
+    },
     entry_points=entry_points,
     classifiers=[
         'Development Status :: 5 - Production/Stable',