diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile
index af2b25c1f7d1..fef18a819b62 100644
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	chirp
-PORTVERSION=	20230520
+PORTVERSION=	20230621
 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=	ec34ec9b7f37301c792e41eefa054a837fae59fe
+GH_TAGNAME=	a86eee172f1510e8f72b75d44c075a43f18d14c7
 
 USE_GNOME=	gtk-update-icon-cache
 
 USE_PYTHON=	autoplist 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
 
 post-install:
 	@cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/share && \
 		${INSTALL_DATA} ${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps && \
 		${INSTALL_DATA} ${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>0:devel/py-importlib-resources@${PY_FLAVOR}
 .endif
 .if ${PYTHON_REL} < 30800
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/comms/chirp/distinfo b/comms/chirp/distinfo
index c44839d309aa..3167619d9efd 100644
--- a/comms/chirp/distinfo
+++ b/comms/chirp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1684545928
-SHA256 (chirp/kk7ds-chirp-20230520-ec34ec9b7f37301c792e41eefa054a837fae59fe_GH0.tar.gz) = 66a8540ad1eae3f6ba165f7eb36d6d27d041abf0aa8f57d2e9d29c2d8fbda533
-SIZE (chirp/kk7ds-chirp-20230520-ec34ec9b7f37301c792e41eefa054a837fae59fe_GH0.tar.gz) = 1841501
+TIMESTAMP = 1687709250
+SHA256 (chirp/kk7ds-chirp-20230621-a86eee172f1510e8f72b75d44c075a43f18d14c7_GH0.tar.gz) = dd2317f9050b8234ae271cd2d3a97af958eab24b9ff91499bc96c9c52b7986ca
+SIZE (chirp/kk7ds-chirp-20230621-a86eee172f1510e8f72b75d44c075a43f18d14c7_GH0.tar.gz) = 1873239