diff --git a/.gitignore b/.gitignore
index 03c8891..cc1e0d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.pyc
-__pycache__
+__pycache__/
 
 *.idea
 
@@ -7,6 +7,7 @@ build/
 dist/
 *.egg-info/
 .mypy_cache/
+.pytest_cache/
 
 *.swp
 *.swo
diff --git a/g85/LICENSE.md b/g85/LICENSE.md
new file mode 120000
index 0000000..7eabdb1
--- /dev/null
+++ b/g85/LICENSE.md
@@ -0,0 +1 @@
+../LICENSE.md
\ No newline at end of file
diff --git a/g85/README.md b/g85/README.md
new file mode 120000
index 0000000..32d46ee
--- /dev/null
+++ b/g85/README.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file
diff --git a/g85/VERSION.py b/g85/VERSION.py
deleted file mode 100644
index 202c26a..0000000
--- a/g85/VERSION.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" VERSION defintion. THIS FILE IS MANUALLY PARSED BY setup.py and REQUIRES A SPECIFIC FORMAT """
-__version__ = '''
-0.4
-'''.strip()
diff --git a/g85/__init__.py b/g85/__init__.py
index 8514051..ad2f659 100644
--- a/g85/__init__.py
+++ b/g85/__init__.py
@@ -1,3 +1,6 @@
 from .main import Map, Device
 from .read import read
 from .write import write
+
+__author__ = 'Jan Petykiewicz'
+__version__ = '0.4'
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..92c0b74
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,45 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "g85"
+description = "G85 wafer map reader / writer"
+readme = "README.md"
+license = { file = "LICENSE.md" }
+authors = [
+    { name="Jan Petykiewicz", email="jan@mpxd.net" },
+    ]
+homepage = "https://mpxd.net/code/jan/g85"
+repository = "https://mpxd.net/code/jan/g85"
+keywords = [
+    "design",
+    "CAD",
+    "EDA",
+    "electronics",
+    "photonics",
+    "IC",
+    "mask",
+    "wafer",
+    "map",
+    "G85",
+    "wmap",
+    ]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Information Technology",
+    "Intended Audience :: Manufacturing",
+    "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)",
+    ]
+requires-python = ">=3.8"
+dynamic = ["version"]
+dependencies = [
+    "numpy~=1.21",
+    ]
+
+[tool.hatch.version]
+path = "g85/__init__.py"
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 1bdf57d..0000000
--- a/setup.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-
-from setuptools import setup, find_packages
-
-
-with open('README.md', 'r') as f:
-    long_description = f.read()
-
-with open('g85/VERSION.py', 'rt') as f:
-    version = f.readlines()[2].strip()
-
-setup(
-    name='g85',
-    version=version,
-    description='G85 wafer map reader / writer',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    author='Jan Petykiewicz',
-    author_email='jan@mpxd.net',
-    url='https://mpxd.net/code/jan/g85',
-    packages=find_packages(),
-    package_data={
-        'g85': ['py.typed'],
-    },
-    install_requires=[
-        'numpy',
-    ],
-    classifiers=[
-        'Programming Language :: Python :: 3',
-        'Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-        'Intended Audience :: Information Technology',
-        'Intended Audience :: Manufacturing',
-        'Intended Audience :: Science/Research',
-        'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
-        'Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)',
-    ],
-    keywords=[
-        'design',
-        'CAD',
-        'EDA',
-        'electronics',
-        'photonics',
-        'IC',
-        'mask',
-        'wafer',
-        'map',
-        'G85',
-        'wmap',
-    ],
-    )