diff --git a/.travis.yml b/.travis.yml
index f3f988b0..9260d6bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,8 @@ matrix:
       env: TOXENV=py39
     - python: "3.10"
       env: TOXENV=py310
+    - python: "3.11-dev"
+      env: TOXENV=py311
     # PyPy Environments
     - python: "pypy3.6-7.3.3"
       env: TOXENV=pypy36
diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md
index a98a2595..014e66ab 100644
--- a/CONTRIBUTIONS.md
+++ b/CONTRIBUTIONS.md
@@ -24,6 +24,8 @@ The contributors have been listed in chronological order:
 
 * Andreas Motl <andreas@getkotori.org>
   * Mar 2020 - Fix XMPP Support
+  * Oct 2022 - Drop support for Python 2
+  * Oct 2022 - Add support for Python 3.11
 
 * Joey Espinosa <@particledecay>
   * Apr 3rd 2022 - Added Ntfy Support
diff --git a/setup.py b/setup.py
index e8666c12..690a2538 100755
--- a/setup.py
+++ b/setup.py
@@ -94,6 +94,7 @@ setup(
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'License :: OSI Approved :: MIT License',
diff --git a/tox.ini b/tox.ini
index d71c3040..f3715a57 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,5 @@
 [tox]
-envlist = py36,py37,py38,py39,py310,pypy36,pypy39,bare,coverage-report
-
+envlist = py36,py37,py38,py39,py310,py311.pypy36,pypy39,bare,coverage-report
 
 [testenv]
 # Prevent random setuptools/pip breakages like
@@ -69,6 +68,16 @@ commands =
     coverage run -m pytest {posargs}
     flake8 . --count --show-source --statistics
 
+[testenv:py311]
+deps=
+   dbus-python
+   -r{toxinidir}/requirements.txt
+   -r{toxinidir}/dev-requirements.txt
+   -r{toxinidir}/all-plugin-requirements.txt
+commands =
+    python setup.py compile_catalog
+    coverage run --parallel -m pytest {posargs}
+    flake8 . --count --show-source --statistics
 
 [testenv:bare]
 deps=