diff --git a/pokedex/db/markdown.py b/pokedex/db/markdown.py
index 4873118..b1414a7 100644
--- a/pokedex/db/markdown.py
+++ b/pokedex/db/markdown.py
@@ -17,8 +17,9 @@ import re
 import markdown
 import six
 from sqlalchemy.orm.session import object_session
-from markdown.util import etree, AtomicString
 
+from markdown.util import AtomicString
+import xml.etree.ElementTree as etree 
 
 @six.python_2_unicode_compatible
 class MarkdownString(object):
diff --git a/setup.py b/setup.py
index e2257a5..e728a37 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ setup(
     install_requires=[
         'SQLAlchemy>=1.0,<1.4',
         'whoosh>=2.5,<2.7',
-        'markdown>=2.4.1,<=2.6.11',
+        'markdown>=3.4,<3.5',
         'construct==2.5.3',
         'six>=1.9.0',
     ],