diff --git a/devel/py-matrix-common/Makefile b/devel/py-matrix-common/Makefile
index a1ece7348305..9814c9036e8f 100644
--- a/devel/py-matrix-common/Makefile
+++ b/devel/py-matrix-common/Makefile
@@ -1,29 +1,36 @@
 PORTNAME=	matrix-common
-DISTVERSION=	1.1.0
+DISTVERSION=	1.2.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	matrix_common-${PORTVERSION}
 
 MAINTAINER=	ports@skyforge.at
 COMMENT=	Common utilities for Synapse, Sydent and Sygnal
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>19.2.0:devel/py-attrs@${PY_FLAVOR}
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=18.9.0:devel/py-twisted@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 
+.include <bsd.port.pre.mk>
+
+# Dependency required by Python < 3.8
+.if (${PYTHON_REL} < 30800)
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=1.4:devel/py-importlib-metadata@${PY_FLAVOR}
+.endif
+
 post-extract:
 	@${CP} ${FILESDIR}/setup.py ${WRKSRC}/
 
 do-test:
 	cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/py-matrix-common/distinfo b/devel/py-matrix-common/distinfo
index ba03a6bed924..51b299d28b77 100644
--- a/devel/py-matrix-common/distinfo
+++ b/devel/py-matrix-common/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645632949
-SHA256 (matrix_common-1.1.0.tar.gz) = a8238748afc2b37079818367fed5156f355771b07c8ff0a175934f47e0ff3276
-SIZE (matrix_common-1.1.0.tar.gz) = 9268
+TIMESTAMP = 1657038883
+SHA256 (matrix_common-1.2.1.tar.gz) = a99dcf02a6bd95b24a5a61b354888a2ac92bf2b4b839c727b8dd9da2cdfa3853
+SIZE (matrix_common-1.2.1.tar.gz) = 9709