diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 00000000..9787c3bd
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
diff --git a/setup.cfg b/setup.cfg
index ff0117c5..f9b19c12 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,49 @@
 [metadata]
-license_files = LICENSE.md
+name = novelWriter
 version = attr: nw.__version__
+author = Veronica Berglyd Olsen
+author_email = code@vkbo.net
+description = A markdown-like document editor for writing novels
+url = https://novelwriter.io
+long_description = file: README.md
+long_description_content_type = text/markdown
+license_files = LICENSE.md
+license = GNU General Public License v3
+classifiers =
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: Implementation :: CPython
+    License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+    Development Status :: 4 - Beta
+    Operating System :: OS Independent
+    Intended Audience :: End Users/Desktop
+    Natural Language :: English
+    Topic :: Text Editors
+python_requires = >=3.6
+install_requires =
+    pyqt5>=5.2.1
+    lxml>=4.2.0
+    pyenchant>=3.0.0
+project_urls =
+    Bug Tracker = https://github.com/vkbo/novelWriter/issues
+    Documentation = https://github.com/vkbo/novelWriter/issues
+    Source Code = https://github.com/vkbo/novelWriter
+
+[options]
+include_package_data = True
+packages = find:
+
+[options.packages.find]
+exclude = docs, tests, sample
+
+[options.entry_points]
+console_script =
+    novelWriter-cli = nw:main
+gui_scripts =
+    novelWriter = nw:main
 
 [bdist_wheel]
 universal = 0
diff --git a/setup.py b/setup.py
index 6b10a84e..ed17b904 100755
--- a/setup.py
+++ b/setup.py
@@ -113,50 +113,4 @@ if len(sys.argv) == 1:
 #  Build the Package
 ##
 
-# Read content from files
-with open("README.md", "r") as inFile:
-    longDescription = inFile.read()
-
-setuptools.setup(
-    name = "novelWriter",
-    # version = __version__, # Set in setup.cfg
-    author = "Veronica Berglyd Olsen",
-    author_email = "code@vkbo.net",
-    description = "A markdown-like document editor for writing novels",
-    long_description = longDescription,
-    long_description_content_type = "text/markdown",
-    license = "GNU General Public License v3",
-    url = "https://novelwriter.io",
-    entry_points = {
-        "console_scripts" : ["novelWriter-cli=nw:main"],
-        "gui_scripts" :     ["novelWriter=nw:main"],
-    },
-    packages = setuptools.find_packages(exclude=["docs", "tests", "sample"]),
-    include_package_data = True,
-    package_data = {"": ["*.conf"]},
-    project_urls = {
-        "Bug Tracker": "https://github.com/vkbo/novelWriter/issues",
-        "Documentation": "https://github.com/vkbo/novelWriter/issues",
-        "Source Code": "https://github.com/vkbo/novelWriter",
-    },
-    classifiers = [
-        "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: Implementation :: CPython",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-        "Development Status :: 4 - Beta",
-        "Operating System :: OS Independent",
-        "Intended Audience :: End Users/Desktop",
-        "Natural Language :: English",
-        "Topic :: Text Editors",
-    ],
-    python_requires = ">=3.6",
-    install_requires = [
-        "pyqt5>=5.2.1",
-        "lxml>=4.2.0",
-        "pyenchant>=3.0.0",
-    ],
-)
+setuptools.setup()