diff --git a/Makefile b/Makefile
index 6064a7d..88b0d44 100644
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,10 @@ sphinx-notebooks:
 	cp -r notebooks/*_files docs/notebooks/notebooks/
 
 wheel:
-	python setup.py bdist_wheel --universal
+	python -m build -w
 
 sdist:
-	python setup.py sdist
+	python -m build -s
 
-upload:
-	python setup.py sdist bdist_wheel upload
+upload: wheel sdist
+	twine upload ./dist/*
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..238d19a
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,53 @@
+[build-system]
+requires = ["setuptools>=61.2"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "Optunity"
+version = "1.1.1"
+authors = [{name = "Marc Claesen", email = "marc.claesen@esat.kuleuven.be"}]
+license = {text = "LICENSE.txt"}
+description = "Optimization routines for hyperparameter tuning."
+keywords = [
+    "machine learning",
+    "parameter tuning",
+    "hyperparameter optimization",
+    "meta-optimization",
+    "direct search",
+    "model selection",
+    "particle swarm optimization",
+]
+readme = "README.rst"
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Education",
+    "Intended Audience :: Science/Research",
+    "Programming Language :: Python",
+    "License :: OSI Approved :: BSD License",
+    "Topic :: Scientific/Engineering",
+    "Topic :: Scientific/Engineering :: Artificial Intelligence",
+    "Topic :: Scientific/Engineering :: Information Analysis",
+    "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.2",
+    "Programming Language :: Python :: 3.3",
+    "Programming Language :: Python :: 3.4",
+]
+
+[project.urls]
+Homepage = "http://www.optunity.net"
+"Source Code" = "https://github.com/claesenm/optunity"
+"Bug Tracker" = "https://github.com/claesenm/optunity/issues"
+
+[tool.setuptools]
+packages = [
+    "optunity",
+    "optunity.tests",
+    "optunity.solvers",
+]
+platforms = ["any"]
+include-package-data = false
+
+[tool.distutils.bdist_wheel]
+universal = 1
diff --git a/setup.py b/setup.py
index 78b0b72..7f1a176 100755
--- a/setup.py
+++ b/setup.py
@@ -1,35 +1,4 @@
-from distutils.core import setup
-import setuptools
+from setuptools import setup
 
-setup(
-    name = 'Optunity',
-    version = '1.1.1',
-    author = 'Marc Claesen',
-    author_email = 'marc.claesen@esat.kuleuven.be',
-    packages = ['optunity', 'optunity.tests', 'optunity.solvers'],
-    scripts = [],
-    url = 'http://www.optunity.net',
-    license = 'LICENSE.txt',
-    description = 'Optimization routines for hyperparameter tuning.',
-    long_description = open('README.rst').read(),
-    classifiers = ['Development Status :: 5 - Production/Stable',
-                   'Intended Audience :: Developers',
-                   'Intended Audience :: Education',
-                   'Intended Audience :: Science/Research',
-                   'Programming Language :: Python',
-                   'License :: OSI Approved :: BSD License',
-                   'Topic :: Scientific/Engineering',
-                   'Topic :: Scientific/Engineering :: Artificial Intelligence',
-                   'Topic :: Scientific/Engineering :: Information Analysis',
-                   'Programming Language :: Python :: 2.7',
-                   'Programming Language :: Python :: 3',
-                   'Programming Language :: Python :: 3.2',
-                   'Programming Language :: Python :: 3.3',
-                   'Programming Language :: Python :: 3.4'
-                   ],
-    platforms = ['any'],
-    keywords = ['machine learning', 'parameter tuning',
-                'hyperparameter optimization', 'meta-optimization',
-                'direct search', 'model selection', 'particle swarm optimization'
-                ],
-)
+if __name__ == "__main__":
+    setup()