diff --git a/textproc/py-tomlkit/Makefile b/textproc/py-tomlkit/Makefile
new file mode 100644
index 00000000000..984dedaa801
--- /dev/null
+++ b/textproc/py-tomlkit/Makefile
@@ -0,0 +1,22 @@
+COMMENT =		style-preserving TOML library for Python
+
+MODPY_EGG_VERSION =	0.11.6
+DISTNAME =		tomlkit-${MODPY_EGG_VERSION}
+PKGNAME =		py-${DISTNAME}
+CATEGORIES =		textproc
+
+# MIT
+PERMIT_PACKAGE=	Yes
+
+MODULES=		lang/python
+
+MODPY_PI =		Yes
+MODPY_PYBUILD =		poetry-core
+
+FLAVORS =		python3
+FLAVOR =		python3
+
+TEST_DEPENDS =		devel/py-test-cov${MODPY_FLAVOR} \
+			textproc/py-yaml${MODPY_FLAVOR}
+
+.include <bsd.port.mk>
diff --git a/textproc/py-tomlkit/distinfo b/textproc/py-tomlkit/distinfo
new file mode 100644
index 00000000000..6f0f13a8abf
--- /dev/null
+++ b/textproc/py-tomlkit/distinfo
@@ -0,0 +1,2 @@
+SHA256 (tomlkit-0.11.6.tar.gz) = cblS5XIWiJN/sCz501TbzweFBmFJ0oVeRFMevdK2XXM=
+SIZE (tomlkit-0.11.6.tar.gz) = 188290
diff --git a/textproc/py-tomlkit/pkg/DESCR b/textproc/py-tomlkit/pkg/DESCR
new file mode 100644
index 00000000000..cf87f5e841f
--- /dev/null
+++ b/textproc/py-tomlkit/pkg/DESCR
@@ -0,0 +1,8 @@
+TOML Kit is a 1.0.0-compliant TOML library.
+
+It includes a parser that preserves all comments, indentations,
+whitespace and internal element ordering, and makes them accessible and
+editable via an intuitive API.
+
+You can also create new TOML documents from scratch using the provided
+helpers.
diff --git a/textproc/py-tomlkit/pkg/PLIST b/textproc/py-tomlkit/pkg/PLIST
new file mode 100644
index 00000000000..23583017357
--- /dev/null
+++ b/textproc/py-tomlkit/pkg/PLIST
@@ -0,0 +1,46 @@
+@conflict py-toml-*
+@pkgpath textproc/py-toml
+lib/python${MODPY_VERSION}/site-packages/tomlkit/
+lib/python${MODPY_VERSION}/site-packages/tomlkit-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/tomlkit-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/tomlkit-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/tomlkit-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/tomlkit-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/tomlkit/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}items.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}items.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}toml_char.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}toml_char.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}toml_document.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}toml_document.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}toml_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/tomlkit/${MODPY_PYCACHE}toml_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tomlkit/_compat.py
+lib/python${MODPY_VERSION}/site-packages/tomlkit/_utils.py
+lib/python${MODPY_VERSION}/site-packages/tomlkit/api.py
+lib/python${MODPY_VERSION}/site-packages/tomlkit/container.py
+lib/python${MODPY_VERSION}/site-packages/tomlkit/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/tomlkit/items.py
+lib/python${MODPY_VERSION}/site-packages/tomlkit/parser.py
+lib/python${MODPY_VERSION}/site-packages/tomlkit/py.typed
+lib/python${MODPY_VERSION}/site-packages/tomlkit/source.py
+lib/python${MODPY_VERSION}/site-packages/tomlkit/toml_char.py
+lib/python${MODPY_VERSION}/site-packages/tomlkit/toml_document.py
+lib/python${MODPY_VERSION}/site-packages/tomlkit/toml_file.py