diff --git a/net-im/biboumi/Makefile b/net-im/biboumi/Makefile
index da1f703..e71a356 100644
--- a/net-im/biboumi/Makefile
+++ b/net-im/biboumi/Makefile
@@ -1,27 +1,28 @@
-# $FreeBSD$
-
 PORTNAME=	biboumi
 DISTVERSION=	9.0
 CATEGORIES=	net-im
 MASTER_SITES=	https://git.louiz.org/biboumi/snapshot/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	samir@noir.im
 COMMENT=	XMPP gateway to IRC
 
 LICENSE=	ZLIB
 
-BUILD_DEPENDS=	git:devel/git \
-		${PY_SPHINX}
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		cmake iconv localbase:ldflags pkgconfig python:build
 CMAKE_ARGS+=	-DWITHOUT_SYSTEMD=1
 
+USE_GITHUB=	nodefault
+GH_TUPLE=	catchorg:Catch2:v2.2.1:catch/external/src/catch
+
 OPTIONS_DEFINE=		DOCS LIBIDN PGSQL SQLITE3 TLS UDNS
 OPTIONS_DEFAULT=	LIBIDN PGSQL SQLITE3 TLS UDNS
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
+			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme
 DOCS_PORTDOCS=		*
 
 LIBIDN_LIB_DEPENDS=	libidn.so:dns/libidn
@@ -58,6 +59,9 @@ USE_RC_SUBR=	biboumi
 SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
 PLIST_SUB=	${SUB_LIST}
 
+post-patch:
+	${REINPLACE_CMD} -e 's,GIT_REPOSITORY.*Catch.git",SOURCE_DIR "${WRKSRC}/external/src/catch",' ${WRKSRC}/CMakeLists.txt
+
 post-build:
 	cd ${WRKSRC}/doc && ${MAKE} man
 
diff --git a/net-im/biboumi/distinfo b/net-im/biboumi/distinfo
index 20806c3..dd59862 100644
--- a/net-im/biboumi/distinfo
+++ b/net-im/biboumi/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1602940785
+TIMESTAMP = 1623944343
 SHA256 (biboumi-9.0.tar.gz) = 4d5bd5e21252ab4e79c14413afb922d69beba802519c9f38796f6c1372abac41
 SIZE (biboumi-9.0.tar.gz) = 201049
+SHA256 (catchorg-Catch2-v2.2.1_GH0.tar.gz) = 3938bc896f8de570bc56d25606fc128437ee53590a95cf3e005710176a1a1ce4
+SIZE (catchorg-Catch2-v2.2.1_GH0.tar.gz) = 487804