diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile
index ff690d609e13..361caba6f434 100644
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@@ -1,57 +1,61 @@
 PORTNAME=	chirp
-PORTVERSION=	20230731
-PORTREVISION=	1
+DISTVERSION=	20240120
 CATEGORIES=	comms hamradio
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 DIST_SUBDIR=	chirp
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Free, open-source tool for programming your amateur radio
 WWW=		https://chirp.danplanet.com/projects/chirp
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}versioningit>0:devel/py-versioningit@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yattag>0:devel/py-yattag@${PY_FLAVOR}
 
 USES=		desktop-file-utils gnome python shebangfix
 SHEBANG_GLOB=	*.py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kk7ds
-GH_TAGNAME=	c49fb6d8a46270a47718b0b4857695d5d0d83780
+GH_TAGNAME=	2205c0f
 
 USE_GNOME=	gtk-update-icon-cache
 
-USE_PYTHON=	autoplist pep517 pytest
+USE_PYTHON=	pep517 pytest
 
 USE_WX=	3.2
 WX_COMPS=	python:run
 
-PLIST_FILES=	share/applications/${PORTNAME}.desktop \
-		share/pixmaps/${PORTNAME}.png
-
 PORTSCOUT=	ignore:1
 NO_ARCH=	yes
 
-post-patch:
-	@${ECHO} "Version: ${PORTVERSION}" > ${WRKSRC}/PKG-INFO
+pre-build:
+	@${REINPLACE_CMD} -e 's|version=0|version=${PORTVERSION}|' \
+		${WRKSRC}/setup.py
 
 post-install:
 	@cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/share && \
 		${INSTALL_DATA} ${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps && \
 		${INSTALL_DATA} ${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 
+	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/share/locale
+	@cd ${WRKSRC}/chirp && \
+		${COPYTREE_SHARE}  locale ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/
+	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/locale/Makefile
+	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/locale/check_parameters.py
+	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/locale/README.md
+
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>0:devel/py-importlib-resources@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/comms/chirp/distinfo b/comms/chirp/distinfo
index 786b3ce4094b..2512a47785f1 100644
--- a/comms/chirp/distinfo
+++ b/comms/chirp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1690866289
-SHA256 (chirp/kk7ds-chirp-20230731-c49fb6d8a46270a47718b0b4857695d5d0d83780_GH0.tar.gz) = 68b740ba5ccd37a3a9888aee2481d84bdceb1270ba8bf50f81bf9cd68057d787
-SIZE (chirp/kk7ds-chirp-20230731-c49fb6d8a46270a47718b0b4857695d5d0d83780_GH0.tar.gz) = 1926594
+TIMESTAMP = 1705961921
+SHA256 (chirp/kk7ds-chirp-20240120-2205c0f_GH0.tar.gz) = 0bc03dee53c820ae3875fea7319593b7a8ea754c64c8aef62e2663e4a0ee4b2b
+SIZE (chirp/kk7ds-chirp-20240120-2205c0f_GH0.tar.gz) = 2197788