diff --git a/devel/commitizen/Makefile b/devel/commitizen/Makefile
index 12eb71dfea76..42cff50d24ed 100644
--- a/devel/commitizen/Makefile
+++ b/devel/commitizen/Makefile
@@ -1,35 +1,37 @@
 PORTNAME=	commitizen
-PORTVERSION=	3.27.0
-PORTREVISION=	1
+PORTVERSION=	3.31.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Commitizen client tool written in Python
 WWW=		https://commitizen-tools.github.io/commitizen/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_BDEPS=	poetry-core>0:devel/py-poetry-core
 PY_RDEPS=	Jinja2>=2.10.3:devel/py-Jinja2 \
 		argcomplete>=1.12.1:devel/py-argcomplete \
 		charset-normalizer>=2.1.0:textproc/py-charset-normalizer \
 		colorama>=0.4.1:devel/py-colorama \
 		decli>=0.6.0:devel/py-decli \
-		importlib-metadata>=4.13:devel/py-importlib-metadata \
 		packaging>=19:devel/py-packaging \
 		pyyaml>=3.08:devel/py-pyyaml \
 		prompt-toolkit>0:devel/py-prompt-toolkit \
-		questionary>=1.9:devel/py-questionary \
+		questionary>=2.0:devel/py-questionary \
 		termcolor>=1.1:devel/py-termcolor \
 		tomlkit>=0.5.3:textproc/py-tomlkit
 BUILD_DEPENDS=	${PY_BDEPS:S,^,${PYTHON_PKGNAMEPREFIX},:S,$,@${PY_FLAVOR},}
 RUN_DEPENDS=	${PY_RDEPS:S,^,${PYTHON_PKGNAMEPREFIX},:S,$,@${PY_FLAVOR},}
 
 USES=		python
 USE_PYTHON=	autoplist pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
+
+.if ${PYTHON_MAJOR_VER} == 3 && ${PYTHON_VER:E} < 10
+PY_RDEPS+=	importlib-metadata>=8.0.0:devel/py-importlib-metadata
+.endif
diff --git a/devel/commitizen/distinfo b/devel/commitizen/distinfo
index 08e4770f9857..d29e6dee3bf4 100644
--- a/devel/commitizen/distinfo
+++ b/devel/commitizen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1716347208
-SHA256 (commitizen-3.27.0.tar.gz) = 5874d0c7e8e1be3b75b1b0a2269cffe3dd5c843b860d84b0bdbb9ea86e3474b8
-SIZE (commitizen-3.27.0.tar.gz) = 49736
+TIMESTAMP = 1731743988
+SHA256 (commitizen-3.31.0.tar.gz) = 6ab973e91d07c1e745c6c0efe6dd0708b1f6d8fd7e4ab5e7c773b5ceb3df4ff0
+SIZE (commitizen-3.31.0.tar.gz) = 51227