diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 24107e0..50554d5 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -9,14 +9,32 @@ jobs:
       PYTHONDEVMODE: 1
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
         django-version:
+          - '>=4.0a1,<4.1'
           - '>=3.2,<4.0'
           - '>=3.1,<3.2'
           - '>=3.0,<3.1'
           - '>=2.2,<3.0'
           - '>=2.1,<2.2'
           - '>=2.0,<2.1'
+        exclude:
+          - python-version: 3.6
+            django-version: '>=4.0a1,<4.1'
+          - python-version: 3.7
+            django-version: '>=4.0a1,<4.1'
+          - python-version: '3.10'
+            django-version: '>=3.2,<4.0'
+          - python-version: '3.10'
+            django-version: '>=3.1,<3.2'
+          - python-version: '3.10'
+            django-version: '>=3.0,<3.1'
+          - python-version: '3.10'
+            django-version: '>=2.2,<3.0'
+          - python-version: '3.10'
+            django-version: '>=2.1,<2.2'
+          - python-version: '3.10'
+            django-version: '>=2.0,<2.1'
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cfde32f..19c084a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 django-python3-ldap changelog
 =============================
 
+0.13.1
+------
+
+- Django 4.0 compatibility (@sn1c).
+
+
 0.13.0
 ------