diff --git a/devel/py-moto/Makefile b/devel/py-moto/Makefile
index bdb974e93171..c26d2781d617 100644
--- a/devel/py-moto/Makefile
+++ b/devel/py-moto/Makefile
@@ -1,37 +1,35 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 
 PORTNAME=	moto
-PORTVERSION=	1.3.16
-PORTREVISION=	1
+PORTVERSION=	2.0.6
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Allow your python tests to easily mock out the boto library
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>=2.36.0:devel/py-boto@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}boto3>=1.9.201:www/py-boto3@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>=1.9.201:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}botocore>=1.12.201:devel/py-botocore@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=2.9.2:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}markupsafe>=0<2.0:textproc/py-markupsafe@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}more-itertools>=0:devel/py-more-itertools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1<3.0.0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.5:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>=0.9.0:devel/py-responses@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xmltodict>=0:devel/py-xmltodict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zipp>=0:devel/py-zipp@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-moto/distinfo b/devel/py-moto/distinfo
index 90e161d8a3f7..b89448fb21d0 100644
--- a/devel/py-moto/distinfo
+++ b/devel/py-moto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604480694
-SHA256 (moto-1.3.16.tar.gz) = 6c686b1f117563391957ce47c2106bc3868783d59d0e004d2446dce875bec07f
-SIZE (moto-1.3.16.tar.gz) = 1761006
+TIMESTAMP = 1620405413
+SHA256 (moto-2.0.6.tar.gz) = 7982176837406cabb47a84785125d337b6df357ae92ae29423724d072764dd90
+SIZE (moto-2.0.6.tar.gz) = 1557871
diff --git a/devel/py-moto/files/patch-setup.py b/devel/py-moto/files/patch-setup.py
new file mode 100644
index 000000000000..94b05af264de
--- /dev/null
+++ b/devel/py-moto/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2021-05-03 12:18:17 UTC
++++ setup.py
+@@ -32,7 +32,7 @@ def get_version():
+ install_requires = [
+     "boto3>=1.9.201",
+     "botocore>=1.12.201",
+-    "cryptography>=3.3.1",
++    "cryptography>=2.9.2",
+     "requests>=2.5",
+     "xmltodict",
+     "six>1.9",