diff --git a/sysutils/py-azure-cli-core/Makefile b/sysutils/py-azure-cli-core/Makefile
index 4d77a260bc26..c5b2a3631b61 100644
--- a/sysutils/py-azure-cli-core/Makefile
+++ b/sysutils/py-azure-cli-core/Makefile
@@ -1,38 +1,35 @@
 PORTNAME=	azure-cli-core
-PORTVERSION=	2.29.2
+PORTVERSION=	2.31.0
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Microsoft Azure Command-Line Tools Core Module
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}adal>=1.2.7:net-mgmt/py-adal@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}argcomplete>=1.8:devel/py-argcomplete@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=1.8:devel/py-argcomplete@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-telemetry>=1.0.6:sysutils/py-azure-cli-telemetry@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}colorama>=0.4.1:devel/py-colorama@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}humanfriendly>=4.7<11.0:textproc/py-humanfriendly@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}humanfriendly>=10.0:textproc/py-humanfriendly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>=0:devel/py-jmespath@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}knack>=0.8.2:devel/py-knack@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}msal>=1.10.0<2.0.0:devel/py-msal@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}knack>=0.9.0:devel/py-knack@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msal>=1.16.0<2.0.0:devel/py-msal@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msal-extensions>=0.3.0<0.4:devel/py-msal-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.8<3.0.0:security/py-paramiko@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyjwt1>=0:www/py-pyjwt1@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyjwt>=2.1.0:www/py-pyjwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=17.1.0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.12:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pkginfo>=1.5.0.1:sysutils/py-pkginfo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-core>=1.2.0<2.0.0:devel/py-azure-mgmt-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.8:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR}
 
 USES=		azurepy python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-azure-cli-core/distinfo b/sysutils/py-azure-cli-core/distinfo
index cfa9091ec3ee..23c69ed482da 100644
--- a/sysutils/py-azure-cli-core/distinfo
+++ b/sysutils/py-azure-cli-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635622097
-SHA256 (azure-cli-core-2.29.2.tar.gz) = b2e3473eef853155ec40a5787e3335f32cdf27313b55301120a2c6601a796fcf
-SIZE (azure-cli-core-2.29.2.tar.gz) = 163630
+TIMESTAMP = 1641081105
+SHA256 (azure-cli-core-2.31.0.tar.gz) = 2d859f1b1deac29db0bfd9e96e8a8975e538d9b54210ebc54d6d83dd7c9f4b83
+SIZE (azure-cli-core-2.31.0.tar.gz) = 162988
diff --git a/sysutils/py-azure-cli-core/files/patch-setup.py b/sysutils/py-azure-cli-core/files/patch-setup.py
deleted file mode 100644
index 30c31ccc5e6e..000000000000
--- a/sysutils/py-azure-cli-core/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2021-10-08 09:21:53 UTC
-+++ setup.py
-@@ -48,7 +48,7 @@ DEPENDENCIES = [
-     'azure-cli-telemetry==1.0.6.*',
-     'azure-mgmt-core>=1.2.0,<1.3.0',     # the preview version of azure-mgmt-core is 1.3.0b1, it cannot fit azure-core >=1.14.0
-     'cryptography',
--    'humanfriendly>=4.7,<10.0',
-+    'humanfriendly>=4.7,<11.0',
-     'jmespath',
-     'knack~=0.8.2',
-     'msal>=1.10.0,<2.0.0',