diff --git a/secretary.py b/secretary.py
index 2a21714..f38ba44 100644
--- a/secretary.py
+++ b/secretary.py
@@ -34,7 +34,8 @@ from mimetypes import guess_type, guess_extension
 from uuid import uuid4
 from xml.dom.minidom import parseString
 from xml.parsers.expat import ExpatError, ErrorString
-from jinja2 import Environment, Undefined, Markup
+from jinja2 import Environment, Undefined
+from markupsafe import Markup
 
 PY2 = sys.version_info < (3, 0)
 
diff --git a/setup.py b/setup.py
index 4cea733..45de881 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ setup(
     py_modules=['secretary', 'markdown_map'],
     platforms='any',
     install_requires=[
-        'Jinja2', 'markdown2'
+        'Jinja2', 'markdown2', 'MarkupSafe'
     ],
     tests_require=['pytest'],
     cmdclass={'test': PyTest},