diff --git a/requirements.txt b/requirements.txt
index 721699589..f1a3cd75a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ gunicorn==19.8.0
 humanize==0.5.1
 idna==2.6
 isodate==0.6.0
-markdown==2.6.11
+markdown==3.0
 pandas==0.23.1
 parsedatetime==2.0.0
 pathlib2==2.3.0
@@ -40,4 +40,3 @@ thrift-sasl==0.3.0
 unicodecsv==0.14.1
 unidecode==1.0.22
 contextlib2==0.5.5
-
diff --git a/setup.py b/setup.py
index 373ed7e43..c5dba151a 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ setup(
         'humanize',
         'idna',
         'isodate',
-        'markdown<3.0.0',
+        'markdown>=3.0',
         'pandas>=0.18.0',
         'parsedatetime',
         'pathlib2',
diff --git a/superset/utils.py b/superset/utils.py
index aa580072e..636271206 100644
--- a/superset/utils.py
+++ b/superset/utils.py
@@ -420,7 +420,7 @@ def markdown(s, markup_wrap=False):
                           'li', 'dd', 'dt', 'img', 'a']
     safe_markdown_attrs = {'img': ['src', 'alt', 'title'],
                            'a': ['href', 'alt', 'title']}
-    s = md.markdown(s or '', [
+    s = md.markdown(s or '', extensions=[
         'markdown.extensions.tables',
         'markdown.extensions.fenced_code',
         'markdown.extensions.codehilite',