diff --git a/devel/py-gitdb/Makefile b/devel/py-gitdb/Makefile
index f02ed83a8a6b..d89974db44d4 100644
--- a/devel/py-gitdb/Makefile
+++ b/devel/py-gitdb/Makefile
@@ -1,25 +1,24 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 
 PORTNAME=	gitdb
-PORTVERSION=	4.0.7
-PORTREVISION=	1
+PORTVERSION=	4.0.9
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Git Object Database
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}smmap>=3.0.1<6:devel/py-smmap@${PY_FLAVOR}
 
-USES=		python:3.4+
+USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}gitdb2
 
 .include <bsd.port.mk>
diff --git a/devel/py-gitdb/distinfo b/devel/py-gitdb/distinfo
index 26a32abf1536..d90b73ba7633 100644
--- a/devel/py-gitdb/distinfo
+++ b/devel/py-gitdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619198499
-SHA256 (gitdb-4.0.7.tar.gz) = 96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005
-SIZE (gitdb-4.0.7.tar.gz) = 394664
+TIMESTAMP = 1635730959
+SHA256 (gitdb-4.0.9.tar.gz) = bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa
+SIZE (gitdb-4.0.9.tar.gz) = 394670
diff --git a/devel/py-gitdb/files/patch-setup.py b/devel/py-gitdb/files/patch-setup.py
deleted file mode 100644
index 2c3851b04757..000000000000
--- a/devel/py-gitdb/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2021-03-26 14:25:19 UTC
-+++ setup.py
-@@ -20,7 +20,7 @@ setup(
-     packages=('gitdb', 'gitdb.db', 'gitdb.utils', 'gitdb.test'),
-     license="BSD License",
-     zip_safe=False,
--    install_requires=['smmap>=3.0.1,<5'],
-+    install_requires=['smmap>=3.0.1,<6'],
-     long_description="""GitDB is a pure-Python git object database""",
-     python_requires='>=3.4',
-     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers