diff --git a/sysutils/py-azure-cli-core/Makefile b/sysutils/py-azure-cli-core/Makefile
index 4a952aac84aa..b4bdaabf6b97 100644
--- a/sysutils/py-azure-cli-core/Makefile
+++ b/sysutils/py-azure-cli-core/Makefile
@@ -1,38 +1,42 @@
 PORTNAME=	azure-cli-core
-PORTVERSION=	2.55.0
-PORTREVISION=	5
+PORTVERSION=	2.84.0
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	azure_cli_core-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Microsoft Azure Command-Line Tools Core Module
-WWW=		https://pypi.org/project/azure-cli-core/
+WWW=		https://learn.microsoft.com/en-us/cli/azure/?view=azure-cli-latest \
+		https://github.com/Azure/azure-cli/tree/dev/src/azure-cli-core \
+		https://github.com/Azure/azure-cli
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=3.1.1:devel/py-argcomplete@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=3.5.2:devel/py-argcomplete@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-telemetry>=1.1.0:sysutils/py-azure-cli-telemetry@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}humanfriendly>=10.0:textproc/py-humanfriendly@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-core>=1.38.0<1.39:devel/py-azure-core@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-core>=1.2.0<2:devel/py-azure-mgmt-core@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}humanfriendly>=10.0<11:textproc/py-humanfriendly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>=0:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}knack>=0.11.0:devel/py-knack@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}msal>=1.24.0.b2:devel/py-msal@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}msal-extensions>=1.0.0:devel/py-msal-extensions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.8<4.0.0:security/py-paramiko@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyjwt>=2.1.0:www/py-pyjwt@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyopenssl>=17.1.0,1:security/py-pyopenssl@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.22:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}microsoft-security-utilities-secret-masker>=1.0.0b4<1.1:devel/py-microsoft-security-utilities-secret-masker@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msal>=1.35.0:devel/py-msal@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msal-extensions>=1.2.0:devel/py-msal-extensions@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>=20.9:devel/py-packaging@${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.9:sysutils/py-psutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}msrestazure>=0.6.4:net-mgmt/py-msrestazure@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}packaging>=20.9:devel/py-packaging@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}py-deviceid>=0:devel/py-py-deviceid@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyjwt>=2.1.0:www/py-pyjwt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyopenssl>=17.1.0,1:security/py-pyopenssl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 
-USES=		azurepy python
-USE_PYTHON=	autoplist concurrent cryptography distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent cryptography pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-azure-cli-core/distinfo b/sysutils/py-azure-cli-core/distinfo
index 6d0ef3214b6f..96bcbbcdc482 100644
--- a/sysutils/py-azure-cli-core/distinfo
+++ b/sysutils/py-azure-cli-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1703611242
-SHA256 (azure-cli-core-2.55.0.tar.gz) = 46ee5af06f8cfe565ed28b0415ebe69d75350c62b29c909eee2870550a0805c2
-SIZE (azure-cli-core-2.55.0.tar.gz) = 214563
+TIMESTAMP = 1773840296
+SHA256 (azure_cli_core-2.84.0.tar.gz) = fac801a19de2bb968c89a3a8ca8aee41c1f6e8f99d411fae5a97304d3a317527
+SIZE (azure_cli_core-2.84.0.tar.gz) = 235882
diff --git a/sysutils/py-azure-cli-core/files/patch-setup.py b/sysutils/py-azure-cli-core/files/patch-setup.py
new file mode 100644
index 000000000000..970f0e3ad6c1
--- /dev/null
+++ b/sysutils/py-azure-cli-core/files/patch-setup.py
@@ -0,0 +1,29 @@
+--- setup.py.orig	2025-11-11 12:32:43 UTC
++++ setup.py
+@@ -43,20 +43,20 @@ DEPENDENCIES = [
+ ]
+ 
+ DEPENDENCIES = [
+-    'argcomplete~=3.5.2',
+-    'azure-cli-telemetry==1.1.0.*',
+-    'azure-core~=1.38.0',
++    'argcomplete>=3.5.2',
++    'azure-cli-telemetry>=1.1.0',
++    'azure-core>=1.38.0',
+     'azure-mgmt-core>=1.2.0,<2',
+     'cryptography',
+     # On Linux, the distribution (Ubuntu, Debian, etc) and version are logged in telemetry
+     'distro; sys_platform == "linux"',
+     'humanfriendly~=10.0',
+     'jmespath',
+-    'knack~=0.11.0',
++    'knack>=0.11.0',
+     'microsoft-security-utilities-secret-masker~=1.0.0b4',
+-    'msal-extensions==1.2.0',
++    'msal-extensions>=1.2.0',
+     'msal[broker]==1.35.0b1; sys_platform == "win32"',
+-    'msal==1.35.0b1; sys_platform != "win32"',
++    'msal>=1.35.0b1; sys_platform != "win32"',
+     'packaging>=20.9',
+     'pkginfo>=1.5.0.1',
+     # psutil can't install on cygwin: https://github.com/Azure/azure-cli/issues/9399
diff --git a/sysutils/py-azure-cli-core/pkg-descr b/sysutils/py-azure-cli-core/pkg-descr
index 8ac46ce769b8..3b2388baa6fc 100644
--- a/sysutils/py-azure-cli-core/pkg-descr
+++ b/sysutils/py-azure-cli-core/pkg-descr
@@ -1,4 +1,6 @@
-The Azure CLI is a command-line tool providing a great experience for managing
-Azure resources. The CLI is designed to make scripting easy, query data,
-support long-running operations, and more. Try it today and find out what the
-CLI has to offer!
+Azure CLI is a cross-platform tool that simplifies managing Azure resources from
+the command line. Optimized for automation and ease of use, it supports
+interactive sessions and scripting with straightforward commands that integrate
+seamlessly with the Azure Resource Manager model. You can start using it in your
+browser with Azure Cloud Shell or install it locally to use from your preferred
+terminal.