diff --git a/sysutils/py-azure-cli-acr/Makefile b/sysutils/py-azure-cli-acr/Makefile
index a977b5b33010..63755b0f50f8 100644
--- a/sysutils/py-azure-cli-acr/Makefile
+++ b/sysutils/py-azure-cli-acr/Makefile
@@ -1,24 +1,27 @@
 PORTNAME=	azure-cli-acr
 PORTVERSION=	2.2.9
 PORTREVISION=	3
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Microsoft Azure Command-Line Tools ACR Command Module
-WWW=		https://pypi.org/project/azure-cli-acr/
+WWW=		https://github.com/Azure/azure-cli/tree/dev/src/azure-cli/azure/cli/command_modules/acr \
+		https://github.com/Azure/azure-cli
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${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}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerregistry>=2.8.0:devel/py-azure-mgmt-containerregistry@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-storage-blob>=1.3.1:devel/py-azure-storage-blob@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}azure-storage-blob>=1.3.1:devel/py-azure-storage-blob@${PY_FLAVOR}
 
-USES=		azurepy python
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-azure-cli-acr/files/patch-setup.cfg b/sysutils/py-azure-cli-acr/files/patch-setup.cfg
new file mode 100644
index 000000000000..2479b274c8f1
--- /dev/null
+++ b/sysutils/py-azure-cli-acr/files/patch-setup.cfg
@@ -0,0 +1,9 @@
+--- setup.cfg.orig	2019-06-13 21:18:18 UTC
++++ setup.cfg
+@@ -1,6 +1,5 @@ universal = 1
+ [bdist_wheel]
+ universal = 1
+-azure-namespace-package = azure-cli-command_modules-nspkg
+ 
+ [egg_info]
+ tag_build = 
diff --git a/sysutils/py-azure-cli-acr/files/patch-setup.py b/sysutils/py-azure-cli-acr/files/patch-setup.py
new file mode 100644
index 000000000000..c0274cd048e2
--- /dev/null
+++ b/sysutils/py-azure-cli-acr/files/patch-setup.py
@@ -0,0 +1,15 @@
+--- setup.py.orig	2019-06-13 21:17:46 UTC
++++ setup.py
+@@ -31,9 +31,9 @@ DEPENDENCIES = [
+ 
+ DEPENDENCIES = [
+     'azure-cli-core',
+-    'azure-mgmt-storage==3.3.0',
+-    'azure-storage-blob==1.3.1',
+-    'azure-mgmt-containerregistry==2.8.0',
++    'azure-mgmt-storage>=3.3.0',
++    'azure-storage-blob>=1.3.1',
++    'azure-mgmt-containerregistry>=2.8.0',
+ ]
+ 
+ with open('README.rst', 'r', encoding='utf-8') as f:
diff --git a/sysutils/py-azure-cli-acr/pkg-descr b/sysutils/py-azure-cli-acr/pkg-descr
index cbc8a363e9ab..a43a1a5fdbe5 100644
--- a/sysutils/py-azure-cli-acr/pkg-descr
+++ b/sysutils/py-azure-cli-acr/pkg-descr
@@ -1,6 +1,6 @@
 Microsoft Azure CLI 'acr' Command Module
 
 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 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!