diff --git a/devel/Makefile b/devel/Makefile
index 82f25b67751f..e321796c5de2 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4314,6 +4314,7 @@
     SUBDIR += py-constantly
     SUBDIR += py-construct
     SUBDIR += py-contextlib2
+    SUBDIR += py-contexvars
     SUBDIR += py-convertdate
     SUBDIR += py-cookiecutter
     SUBDIR += py-copier
diff --git a/devel/py-contextvars/Makefile b/devel/py-contextvars/Makefile
new file mode 100644
index 000000000000..0fc03e3ca439
--- /dev/null
+++ b/devel/py-contextvars/Makefile
@@ -0,0 +1,25 @@
+PORTNAME=	contextvars
+PORTVERSION=	2.4
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	meka@tilda.center
+COMMENT=	PEP 567 Backport
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}immutables>=0.9:devel/py-immutables@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
+
+USES=		python:3.6+
+USE_PYTHON=	autoplist concurrent distutils
+
+TEST_ENV=	PYTHONPATH=${WRKSRC}/src
+
+NO_ARCH=	yes
+
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -o addopts=
+
+.include <bsd.port.mk>
diff --git a/devel/py-contextvars/distinfo b/devel/py-contextvars/distinfo
new file mode 100644
index 000000000000..e894890cd65e
--- /dev/null
+++ b/devel/py-contextvars/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1626953090
+SHA256 (contextvars-2.4.tar.gz) = f38c908aaa59c14335eeea12abea5f443646216c4e29380d7bf34d2018e2c39e
+SIZE (contextvars-2.4.tar.gz) = 9570
diff --git a/devel/py-contextvars/pkg-descr b/devel/py-contextvars/pkg-descr
new file mode 100644
index 000000000000..8c43fae2e925
--- /dev/null
+++ b/devel/py-contextvars/pkg-descr
@@ -0,0 +1,4 @@
+This package implements a backport of Python 3.7 contextvars module (see
+PEP 567) for Python 3.6.
+
+WWW: https://github.com/MagicStack/contextvars