diff --git a/textproc/py-elasticsearch-curator/Makefile b/textproc/py-elasticsearch-curator/Makefile
index 31bf181ca700..ae608d0cc025 100644
--- a/textproc/py-elasticsearch-curator/Makefile
+++ b/textproc/py-elasticsearch-curator/Makefile
@@ -1,30 +1,33 @@
 # Created by: Dan Langille <dvl@FreeBSD.org>
 
 PORTNAME=	elasticsearch-curator
-PORTVERSION=	5.8.4
+DISTVERSIONPREFIX=	v
+DISTVERSION=	5.8.4
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	Python index manager for Elasticsearch
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>=1.7.24:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>=2018.10.15:security/py-certifi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click>=7.1.2:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click7>=7.1.2:devel/py-click7@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}elasticsearch>=7.15.1:textproc/py-elasticsearch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-aws4auth>=0.9:www/py-requests-aws4auth@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.4:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}voluptuous>=0.9.3:devel/py-voluptuous@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.7+
-USE_PYTHON=	distutils autoplist
+USE_GITHUB=	yes
+GH_ACCOUNT=	elastic
+GH_PROJECT=	curator
+USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-elasticsearch-curator/distinfo b/textproc/py-elasticsearch-curator/distinfo
index cabaf74381b4..1762c2dd4df3 100644
--- a/textproc/py-elasticsearch-curator/distinfo
+++ b/textproc/py-elasticsearch-curator/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636232966
-SHA256 (elasticsearch-curator-5.8.4.tar.gz) = 806232378d5ef91733b889595fb9d88d923e906cf8d8e8801a4e556c7ed3d32a
-SIZE (elasticsearch-curator-5.8.4.tar.gz) = 235817
+TIMESTAMP = 1638286828
+SHA256 (elastic-curator-v5.8.4_GH0.tar.gz) = 20f785033e020b6563f201ed8635cef6239c99903520e023f7f6a9d4222f92d5
+SIZE (elastic-curator-v5.8.4_GH0.tar.gz) = 240852
diff --git a/textproc/py-elasticsearch-curator/files/patch-setup.cfg b/textproc/py-elasticsearch-curator/files/patch-setup.cfg
index 987f40f4b73f..402909f79f3a 100644
--- a/textproc/py-elasticsearch-curator/files/patch-setup.cfg
+++ b/textproc/py-elasticsearch-curator/files/patch-setup.cfg
@@ -1,20 +1,20 @@
---- setup.cfg.orig	2021-11-07 12:31:29 UTC
+--- setup.cfg.orig	2021-11-30 15:42:26 UTC
 +++ setup.cfg
-@@ -23,7 +23,7 @@ classifiers = 
+@@ -23,7 +23,7 @@ classifiers =
  install_requires = 
- 	voluptuous>=0.12.1
- 	elasticsearch>=7.12.0,<8.0.0
--	urllib3==1.26.4
-+	urllib3>=1.26.4
- 	requests>=2.25.1
- 	boto3>=boto3-1.17.57
- 	requests_aws4auth>=1.0.1
-@@ -34,7 +34,7 @@ install_requires = 
- setup_requires = 
- 	voluptuous>=0.12.1
- 	elasticsearch>=7.12.0,<8.0.0
--	urllib3==1.26.4
-+	urllib3>=1.26.4
- 	requests>=2.25.1
- 	boto3>=boto3-1.17.57
- 	requests_aws4auth>=1.0.1
+     voluptuous>=0.12.1
+     elasticsearch>=7.12.0,<8.0.0
+-    urllib3==1.26.4
++    urllib3>=1.26.4
+     requests>=2.25.1
+     boto3>=boto3-1.17.57
+     requests_aws4auth>=1.0.1
+@@ -35,7 +35,7 @@ install_requires = 
+ setup_requires =
+     voluptuous>=0.12.1
+     elasticsearch>=7.12.0,<8.0.0
+-    urllib3==1.26.4
++    urllib3>=1.26.4
+     requests>=2.25.1
+     boto3>=boto3-1.17.57
+     requests_aws4auth>=1.0.1
diff --git a/textproc/py-elasticsearch-curator/files/patch-setup.py b/textproc/py-elasticsearch-curator/files/patch-setup.py
new file mode 100644
index 000000000000..ca3612a98c60
--- /dev/null
+++ b/textproc/py-elasticsearch-curator/files/patch-setup.py
@@ -0,0 +1,17 @@
+--- setup.py.orig	2021-11-30 13:38:11 UTC
++++ setup.py
+@@ -23,12 +23,12 @@ def get_version():
+ 
+ def get_install_requires():
+     res = ['elasticsearch>=7.12.0,<8.0.0' ]
+-    res.append('urllib3==1.26.4')
++    res.append('urllib3>=1.26.4')
+     res.append('requests>=2.25.1')
+     res.append('boto3>=1.17.57')
+     res.append('requests_aws4auth>=1.0.1')
+     res.append('click>=7.0,<8.0')
+-    res.append('pyyaml==5.4.1')
++    res.append('pyyaml>=5.4.1')
+     res.append('voluptuous>=0.12.1')
+     res.append('certifi>=2020.12.5')
+     res.append('six>=1.15.0')