diff --git a/requirements.txt b/requirements.txt
index 5312baf..4338cd9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 attrs==19.1.0
 flake8==3.7.8
 Flask==1.1.1
-marshmallow==2.15.3
-marshmallow-annotations==2.4.0
+marshmallow==3.6.0
+git+https://www.github.com/hilearn/marshmallow-annotations.git@a7a2dc96932430369bdef36555082df990ed9bef#egg=marshmallow-annotations
 mypy==0.761
 pytest>=4.6
 pytest-cov
diff --git a/setup.py b/setup.py
index bb32baa..16f779f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='amundsen-common',
-    version='0.5.7',
+    version='0.5.8',
     description='Common code library for Amundsen',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',
@@ -31,8 +31,9 @@
         # long as they have a version of pyfoobar equal to or greater than 1.x
         # and less than 2.x installed.
         'flask>=1.0.2',
-        'marshmallow>=2.15.3,<3.0',
-        'marshmallow-annotations>=2.4.0,<3.0'
+        'marshmallow>=2.15.3,<=3.6',
+        ('git+https://www.github.com/hilearn/marshmallow-annotations.git@a7a2dc96932430369bd'
+         'ef36555082df990ed9bef#egg=marshmallow-annotations')
     ],
     python_requires=">=3.6",
     package_data={'amundsen_common': ['py.typed']},