diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1a54f6a..52c5dd2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
     
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
diff --git a/CHANGES.rst b/CHANGES.rst
index c98c41d..492bf3e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,7 +6,9 @@ Changelog
 ------------------
 - improve documentation
   (`#133 <https://github.com/jugmac00/flask-reuploaded/issues/133>`_)
-  
+- drop support for Python 3.6
+- add support for Python 3.11
+
 
 1.2.0 (2021.11.07)
 ------------------
diff --git a/setup.py b/setup.py
index d94e63b..56e2f3f 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ def read(*parts):
 
 setup(
     name="Flask-Reuploaded",
-    version="1.2.1.dev0",
+    version="1.3.0.dev0",
     url="https://github.com/jugmac00/flask-reuploaded",
     project_urls={
         "Source": "https://github.com/jugmac00/flask-reuploaded",
@@ -52,7 +52,7 @@ def read(*parts):
             "pytest-cov",
         ],
     },
-    python_requires=">= 3.6",
+    python_requires=">= 3.7",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
@@ -61,11 +61,11 @@ def read(*parts):
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Framework :: Flask",
diff --git a/tox.ini b/tox.ini
index d3949da..9340983 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 envlist =
-    py36,
     py37,
     py38,
     py39,
     py310,
+    py311,
     lint,
     mypy,
     coverage,
@@ -55,12 +55,11 @@ python_classes = Test[A-Z]*
 
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38, mypy
     3.9: py39, coverage
     3.10: py310, pre-commit
-
+    3.11: py311
 
 [testenv:docs]
 description = generate docs in HTML format