diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 1a28007..d4c8f12 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/README.md b/README.md
index b1af3ae..4da4768 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ The code in this repository is named _PROPKA 3_ and it is based on the original
 
 ## Requirements
 
-PROPKA 3 requires Python 3.6 or higher.  Additional requirements are specified in the `requirements.txt` file and automatically satisfied when installing with [pip](https://pip.pypa.io).
+PROPKA 3 requires Python 3.8 or higher.  Additional requirements are specified in the `requirements.txt` file and automatically satisfied when installing with [pip](https://pip.pypa.io).
 
 ## Installation
 
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index e813ac4..6d0e2fb 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -2,6 +2,14 @@
 Changelog
 *********
 
+Current version
+===============
+
+Changes
+-------
+
+* Remove support for Python 3.6 and 3.7; add support for up to Python 3.11.
+
 v3.4.0
 ======
 
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
index fe9f095..5fd6059 100644
--- a/docs/source/installation.rst
+++ b/docs/source/installation.rst
@@ -5,7 +5,7 @@
 ==============
 
 
-PROPKA 3 requires Python 3.6 or higher. Additional requirements are
+PROPKA 3 requires Python 3.8 or higher. Additional requirements are
 specified in the :file:`requirements.txt` file and automatically satisfied
 when installing with pip_.
 
diff --git a/setup.py b/setup.py
index 1729160..772161a 100755
--- a/setup.py
+++ b/setup.py
@@ -46,8 +46,6 @@
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: Microsoft :: Windows',
         'Programming Language :: Python',
-        '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',
@@ -59,7 +57,7 @@
     package_data={'propka': ['*.dat', '*.cfg', '*.json']},
     entry_points={'console_scripts': ['propka3 = propka.run:main', ]},
     zip_safe=True,
-    python_requires='>=3.6',
+    python_requires='>=3.8',
     tests_require=["numpy", "pytest"],
     test_suite="tests",
     )