diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile
index 894393a..c168cd3 100644
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@@ -2,20 +2,23 @@
 
 PORTNAME=	chirp
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://chirp.danplanet.com/download/${PORTVERSION}/ \
 		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
-COMMENT=	Chirp is a free, open-source tool for programming your amateur radio
+COMMENT=	Free, open-source tool for programming your amateur radio
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/serial:${PORTSDIR}/comms/py-serial \
-		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+BUILD_DEPENDS:=	${CHIRP_DEPENDS}
+RUN_DEPENDS:=	${CHIRP_DEPENDS}
 
-USES=		gettext python desktop-file-utils
+CHIRP_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libxml2>0:${PORTSDIR}/textproc/py-libxml2 \
+		${PYTHON_PKGNAMEPREFIX}serial>0:${PORTSDIR}/comms/py-serial
+
+USES=		desktop-file-utils gettext python
 USE_PYTHON=	distutils
 
 OPTIONS_DEFINE=	DOCS