diff --git a/editors/novelwriter/Makefile b/editors/novelwriter/Makefile
index cf7d4facb3db..e1c755c29969 100644
--- a/editors/novelwriter/Makefile
+++ b/editors/novelwriter/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	novelwriter
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.7
-PORTREVISION=	1
+DISTVERSION=	2.1.1
 CATEGORIES=	editors python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Text editor designed for writing novels
 WWW=		https://novelwriter.io/
 
 LICENSE=	GPLv3
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enchant>=3.0.0:textproc/py-enchant@${PY_FLAVOR}
-BUILD_DEPENDS=	${PY_DEPENDS}
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PY_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python pyqt:5
 USE_PYQT=	pyqt5
-USE_PYTHON=	distutils concurrent autoplist
+USE_PYTHON=	pep517 concurrent autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vkbo
 GH_PROJECT=	novelWriter
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/editors/novelwriter/distinfo b/editors/novelwriter/distinfo
index bb729baf9fc7..6c6bf1b36b18 100644
--- a/editors/novelwriter/distinfo
+++ b/editors/novelwriter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1681671742
-SHA256 (vkbo-novelWriter-v2.0.7_GH0.tar.gz) = 80e2c8f94a409f88501d1973960316ca48fad5c80968fe58397393063d170871
-SIZE (vkbo-novelWriter-v2.0.7_GH0.tar.gz) = 3086125
+TIMESTAMP = 1699247529
+SHA256 (vkbo-novelWriter-v2.1.1_GH0.tar.gz) = f66784328249a073a798d5a1a0345d89cd864761c19e1561a8d0158e22eafb15
+SIZE (vkbo-novelWriter-v2.1.1_GH0.tar.gz) = 3917718
diff --git a/editors/novelwriter/files/patch-setup.cfg b/editors/novelwriter/files/patch-setup.cfg
new file mode 100644
index 000000000000..8d12f7032bc9
--- /dev/null
+++ b/editors/novelwriter/files/patch-setup.cfg
@@ -0,0 +1,9 @@
+--- setup.cfg.orig	2023-11-05 22:12:21 UTC
++++ setup.cfg
+@@ -1,5 +1,5 @@
+ [metadata]
+-name = novelWriter
++name = novelwriter
+ version = attr: novelwriter.__version__
+ author = Veronica Berglyd Olsen
+ author_email = code@vkbo.net