diff --git a/sysutils/conan/Makefile b/sysutils/conan/Makefile
index 121b88c68000..217a8cb1e881 100644
--- a/sysutils/conan/Makefile
+++ b/sysutils/conan/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	conan
-DISTVERSION=	1.39.0
+DISTVERSION=	1.40.0
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C/C++ package manager
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 PY_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}bottle>=0.12.8:www/py-bottle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3,<0.5.0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.0,<3:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}deprecation>=2.0:devel/py-deprecation@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>=1.0.2:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fasteners>=0.14.1:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.16.0,<0.19.0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9,<3:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}node-semver>=0.6.1:devel/py-node-semver@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}patch-ng>=1.17.4,<1.18:devel/py-patch-ng@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pluginbase>=0.5:devel/py-pluginbase@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.0,<3.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0,<2.0.0:www/py-pyjwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.8.1,<3.0.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0,<=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.8,1<1.27,1:net/py-urllib3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tqdm>=4.28.1:misc/py-tqdm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.6,1<1.27,1:net/py-urllib3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tqdm>=4.28.1,<5:misc/py-tqdm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.11,<6.0:devel/py-yaml@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python
 USE_PYTHON=	distutils noflavors autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/conan/distinfo b/sysutils/conan/distinfo
index caf90c376a8f..fbc7f989a28f 100644
--- a/sysutils/conan/distinfo
+++ b/sysutils/conan/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628045351
-SHA256 (conan-1.39.0.tar.gz) = 7f1fa90578f84d5801e53cce6aa7c98ed97a99fb2b38b3f12a5d9784722340e0
-SIZE (conan-1.39.0.tar.gz) = 690131
+TIMESTAMP = 1631571737
+SHA256 (conan-1.40.0.tar.gz) = 73528ed6517635c37b61876b13e63eefbbb3d634421f4821e080f5ab39467ccb
+SIZE (conan-1.40.0.tar.gz) = 694881
diff --git a/sysutils/conan/files/patch-conans_requirements.txt b/sysutils/conan/files/patch-conans_requirements.txt
deleted file mode 100644
index 6f66d84d9cfa..000000000000
--- a/sysutils/conan/files/patch-conans_requirements.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---- conans/requirements.txt.orig	2021-06-30 14:03:08 UTC
-+++ conans/requirements.txt
-@@ -1,16 +1,16 @@
- PyJWT>=1.4.0, <2.0.0
- requests>=2.8.1, <3.0.0
--urllib3>=1.25.8, <1.26
-+urllib3>=1.25.8, <1.27
- colorama>=0.3.3, <0.5.0
- PyYAML>=3.11, <6.0
- patch-ng>=1.17.4, <1.18
- fasteners>=0.14.1
- six>=1.10.0,<=1.15.0
--node-semver==0.6.1
--distro>=1.0.2, <=1.5.0
-+node-semver>=0.6.1
-+distro>=1.0.2
- future>=0.16.0, <0.19.0
- pygments>=2.0, <3.0
--deprecation>=2.0, <2.1
-+deprecation>=2.0
- tqdm>=4.28.1, <5
- Jinja2>=2.9, <3
- python-dateutil>=2.7.0, <3