diff --git a/MOVED b/MOVED
index 05eed7415491..cc5c6f049986 100644
--- a/MOVED
+++ b/MOVED
@@ -9804,7 +9804,6 @@ devel/beautifyphp||2018-01-29|only works for PHP4 which is gone long ago
 devel/clanlib22|devel/clanlib|2018-01-29|No users in the ports tree, newer version available
 devel/php-xdebug|devel/pecl-xdebug|2018-01-30|Moved to pecl
 astro/py-pyfits|astro/py-astropy|2018-01-31|Has expired: Use astro/py-astropy instead
-devel/py-gitdb|devel/py-gitdb2|2018-01-31|Has expired: Use devel/py-gitdb2 instead
 devel/py-smmap|devel/py-smmap2|2018-01-31|Has expired: Use devel/py-smmap2 instead
 devel/rubygem-moneta06|devel/rubygem-moneta|2018-01-31|Has expired: Use devel/rubygem-moneta instead
 lang/ruby22|lang/ruby24|2018-01-31|Has expired: Upgrade to newer version (e.g. lang/ruby24)
diff --git a/devel/Makefile b/devel/Makefile
index 6e401c74a97d..edfa710138c7 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4443,6 +4443,7 @@
     SUBDIR += py-git-up
     SUBDIR += py-git-url-parse
     SUBDIR += py-git_semver
+    SUBDIR += py-gitdb
     SUBDIR += py-gitdb2
     SUBDIR += py-gitless
     SUBDIR += py-gitosis
diff --git a/devel/py-gitdb/Makefile b/devel/py-gitdb/Makefile
new file mode 100644
index 000000000000..eac24786e671
--- /dev/null
+++ b/devel/py-gitdb/Makefile
@@ -0,0 +1,25 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	gitdb
+PORTVERSION=	4.0.4
+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<4:devel/py-smmap@${PY_FLAVOR}
+
+USES=		python:3.4+
+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
new file mode 100644
index 000000000000..bdc7d437f1ac
--- /dev/null
+++ b/devel/py-gitdb/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1589487599
+SHA256 (gitdb-4.0.4.tar.gz) = 6f0ecd46f99bb4874e5678d628c3a198e2b4ef38daea2756a2bfd8df7dd5c1a5
+SIZE (gitdb-4.0.4.tar.gz) = 392964
diff --git a/devel/py-gitdb/pkg-descr b/devel/py-gitdb/pkg-descr
new file mode 100644
index 000000000000..d4da7a9bea75
--- /dev/null
+++ b/devel/py-gitdb/pkg-descr
@@ -0,0 +1,6 @@
+GitDB allows you to access bare git repositories for reading and writing. It
+aims at allowing full access to loose objects as well as packs with performance
+and scalability in mind. It operates exclusively on streams, allowing to handle
+large objects with a small memory footprint.
+
+WWW: https://github.com/gitpython-developers/gitdb