diff --git a/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile
index 85bb18075a87..edba35b71163 100644
--- a/textproc/p5-xmltv/Makefile
+++ b/textproc/p5-xmltv/Makefile
@@ -20,7 +20,6 @@ XMLTV_DEPENDS=	\
 	p5-XML-Writer>=0:textproc/p5-XML-Writer \
 	p5-Date-Manip>=0:devel/p5-Date-Manip \
 	p5-PerlIO-gzip>=0:archivers/p5-PerlIO-gzip \
-	p5-CGI>=0:www/p5-CGI \
 	p5-IO-Compress>=0:archivers/p5-IO-Compress \
 	p5-libwww>=0:www/p5-libwww \
 	p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \
@@ -97,4 +96,10 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/choose/tv_pick/tv_pick_cgi \
 		${STAGEDIR}${PREFIX}/${CGIDIR}/tv_pick.cgi
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} >= 502100
+XMLTV_DEPENDS+= p5-CGI>=0:www/p5-CGI
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/p5-xmltv/pkg-plist b/textproc/p5-xmltv/pkg-plist
index a0554a631e4d..fcd4e9c272ad 100644
--- a/textproc/p5-xmltv/pkg-plist
+++ b/textproc/p5-xmltv/pkg-plist
@@ -85,7 +85,6 @@ bin/tv_validate_grabber
 %%SITE_PERL%%/XMLTV/ValidateFile.pm
 %%SITE_PERL%%/XMLTV/ValidateGrabber.pm
 %%SITE_PERL%%/XMLTV/Version.pm
-%%SITE_ARCH%%/auto/XMLTV/.packlist
 %%PERL5_MAN1%%/tv_augment.1.gz
 %%PERL5_MAN1%%/tv_augment_tz.1.gz
 %%PERL5_MAN1%%/tv_cat.1.gz