diff --git a/requirements.in b/requirements.in
index 41188f0..5b6c49d 100644
--- a/requirements.in
+++ b/requirements.in
@@ -7,13 +7,11 @@
 decorator
 EasyWidgets>=0.3.6
 emoji
-# only needed < py3.4 and causes problems >=3.6 https://stackoverflow.com/a/45716067/
-enum34 ; python_version < "3.4"
-faulthandler ; python_version < "3.3"
 feedgenerator
 feedparser
 FormEncode>=2
-GitPython==2.1.11
+# 3.1.23 drops py36 support
+GitPython<=3.1.23
 html5lib==1.0.1
 Jinja2
 Markdown<3
diff --git a/requirements.txt b/requirements.txt
index 1dedb77..2b7dc0f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -52,9 +52,9 @@
     # via timermiddleware
 genshi==0.7.3
     # via creoleparser
-gitdb2==2.0.4
+gitdb==4.0.7
     # via gitpython
-gitpython==2.1.11
+gitpython==3.1.18
     # via -r requirements.in
 gunicorn==20.1.0
     # via -r requirements.in
@@ -180,8 +180,8 @@
     #   textile
     #   webhelpers2
     #   webtest
-smmap2==2.0.4
-    # via gitdb2
+smmap==4.0.0
+    # via gitdb
 soupsieve==1.9.3
     # via beautifulsoup4
 testfixtures==6.10.0
@@ -194,6 +194,8 @@
     # via colander
 turbogears2==2.3.12
     # via -r requirements.in
+typing-extensions==3.10.0.2
+    # via gitpython
 urllib3==1.26.6
     # via requests
 waitress==1.4.3