diff --git a/devel/py-cookiecutter/Makefile b/devel/py-cookiecutter/Makefile
index e38c4d34f053..ee039cbd12d6 100644
--- a/devel/py-cookiecutter/Makefile
+++ b/devel/py-cookiecutter/Makefile
@@ -1,45 +1,47 @@
 PORTNAME=	cookiecutter
-PORTVERSION=	1.7.3
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Create projects from cookiecutters (project templates)
 WWW=		https://pypi.org/project/cookiecutter/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}binaryornot>=0.4.4:devel/py-binaryornot@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=7.0<9.0.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jinja2-time>=0.2.0:devel/py-jinja2-time@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}poyo>=0:devel/py-poyo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-slugify>=4.0.0:textproc/py-python-slugify@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.23.0:www/py-requests@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.23.0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}poyo>=0:devel/py-poyo@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		git:devel/git
 
-USES=		cpe python:3.6+
+USES=		cpe python:3.7-3.10
 USE_PYTHON=	autoplist concurrent distutils
 
 CPE_VENDOR=	cookiecutter_project
 
 NO_ARCH=	yes
 
 # pytest needs a UTF-8 environment, and it will try and write outside
 # ${WRKDIR} unless told not to.
 
-TEST_ENV=	TMPDIR=${WRKDIR} HOME=${WRKDIR} LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
+TEST_ENV=	HOME=${WRKDIR} \
+		LANG=en_US.UTF-8 \
+		LC_ALL=en_US.UTF-8 \
+		TMPDIR=${WRKDIR}
 
 do-test:
 	@cd ${WRKSRC} && \
 	${SETENV} ${TEST_ENV} ${LOCALBASE}/bin/pytest-${PYTHON_VER} --cov=cookiecutter tests
 
 .include <bsd.port.mk>
diff --git a/devel/py-cookiecutter/distinfo b/devel/py-cookiecutter/distinfo
index 5b6abe5acc23..c924d566da28 100644
--- a/devel/py-cookiecutter/distinfo
+++ b/devel/py-cookiecutter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621078970
-SHA256 (cookiecutter-1.7.3.tar.gz) = 6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457
-SIZE (cookiecutter-1.7.3.tar.gz) = 133496
+TIMESTAMP = 1664107091
+SHA256 (cookiecutter-2.1.1.tar.gz) = f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5
+SIZE (cookiecutter-2.1.1.tar.gz) = 146973