diff --git a/textproc/py-elasticsearch-curator/Makefile b/textproc/py-elasticsearch-curator/Makefile
index 22e06c058e8f..31bf181ca700 100644
--- a/textproc/py-elasticsearch-curator/Makefile
+++ b/textproc/py-elasticsearch-curator/Makefile
@@ -1,30 +1,30 @@
 # Created by: Dan Langille <dvl@FreeBSD.org>
 
 PORTNAME=	elasticsearch-curator
-PORTVERSION=	5.6.0
-PORTREVISION=	1
+PORTVERSION=	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}click6>=6.7:devel/py-click6@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}elasticsearch6>=6.1.0:textproc/py-elasticsearch6@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=7.1.2:devel/py-click@${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
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-elasticsearch-curator/distinfo b/textproc/py-elasticsearch-curator/distinfo
index d43dfcf1c342..cabaf74381b4 100644
--- a/textproc/py-elasticsearch-curator/distinfo
+++ b/textproc/py-elasticsearch-curator/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551683132
-SHA256 (elasticsearch-curator-5.6.0.tar.gz) = d85feee71cd84808fb8e7c8cb87d95f1b337698463dc6d7bbe3b8e2192109764
-SIZE (elasticsearch-curator-5.6.0.tar.gz) = 216257
+TIMESTAMP = 1636232966
+SHA256 (elasticsearch-curator-5.8.4.tar.gz) = 806232378d5ef91733b889595fb9d88d923e906cf8d8e8801a4e556c7ed3d32a
+SIZE (elasticsearch-curator-5.8.4.tar.gz) = 235817
diff --git a/textproc/py-elasticsearch-curator/files/patch-setup.cfg b/textproc/py-elasticsearch-curator/files/patch-setup.cfg
new file mode 100644
index 000000000000..987f40f4b73f
--- /dev/null
+++ b/textproc/py-elasticsearch-curator/files/patch-setup.cfg
@@ -0,0 +1,20 @@
+--- setup.cfg.orig	2021-11-07 12:31:29 UTC
++++ setup.cfg
+@@ -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