diff --git a/.changelog/83.feature b/.changelog/83.feature
new file mode 100644
index 00000000..e708cbf9
--- /dev/null
+++ b/.changelog/83.feature
@@ -0,0 +1 @@
+Fil now supports Python 3.9.
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ccb6fe6e..01f5b15a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
     name: "${{ matrix.os }}: Python ${{ matrix.python-version }}"
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8"]
+        python-version: ["3.6", "3.7", "3.8", "3.9"]
         os: ["ubuntu-latest", "macos-latest"]
 
     runs-on: "${{ matrix.os }}"
@@ -27,7 +27,7 @@ jobs:
         with:
           # We need tags to get the correct code version:
           fetch-depth: 0
-      - uses: "actions/setup-python@v1"
+      - uses: "actions/setup-python@v2"
         with:
           python-version: "${{ matrix.python-version }}"
       - uses: "actions-rs/toolchain@v1"
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 7c22bdea..bf537c2c 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,7 +1,7 @@
 pytest
 pampy
 numpy
-scikit-image
+#scikit-image
 cython
 black
 towncrier==19.9.0rc1
diff --git a/setup.py b/setup.py
index 1c902434..2cc06b53 100644
--- a/setup.py
+++ b/setup.py
@@ -51,6 +51,7 @@ def read(path):
         "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",
     ],
     python_requires=">=3.6",
diff --git a/wheels/build-wheels.sh b/wheels/build-wheels.sh
index c0e568be..f5ae3557 100755
--- a/wheels/build-wheels.sh
+++ b/wheels/build-wheels.sh
@@ -18,7 +18,10 @@ rm -rf build
 
 /opt/python/cp38-cp38/bin/python3 setup.py bdist_wheel -d /tmp/wheel
 
+/opt/python/cp39-cp39/bin/python3 setup.py bdist_wheel -d /tmp/wheel
+
 auditwheel repair --plat manylinux2010_x86_64 -w dist/ /tmp/wheel/filprofiler*cp36*whl
 auditwheel repair --plat manylinux2010_x86_64 -w dist/ /tmp/wheel/filprofiler*cp37*whl
 auditwheel repair --plat manylinux2010_x86_64 -w dist/ /tmp/wheel/filprofiler*cp38*whl
+auditwheel repair --plat manylinux2010_x86_64 -w dist/ /tmp/wheel/filprofiler*cp39*whl