diff --git a/mail/fetchyahoo/Makefile b/mail/fetchyahoo/Makefile
index 2479bac7731a..56afe7f90d53 100644
--- a/mail/fetchyahoo/Makefile
+++ b/mail/fetchyahoo/Makefile
@@ -18,37 +18,33 @@ RUN_DEPENDS=	\
 	${SITE_PERL}/IO/Lines.pm:${PORTSDIR}/devel/p5-IO-stringy \
 	${SITE_PERL}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools \
 	${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-	${SITE_PERL}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net \
 	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-${SITE_PERL}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay \
+	${SITE_PERL}/${PERL_ARCH}/Crypt/SSLeay.pm:${PORTSDIR}/security/p5-Crypt-SSLeay \
 	${SITE_PERL}/${PERL_ARCH}/HTML/Filter.pm:${PORTSDIR}/www/p5-HTML-Parser\
 	${SITE_PERL}/HTTP/Request/Common.pm:${PORTSDIR}/www/p5-libwww
 
-DOCS=		COPYING ChangeLog Credits INSTALL TODO index.html
 MAN1=		fetchyahoo.1
+PLIST_DIRS=	share/examples/fetchyahoo
+PLIST_FILES=	bin/fetchyahoo share/examples/fetchyahoo/fetchyahoorc
+PORTDOCS=	COPYING ChangeLog Credits INSTALL TODO index.html
 NO_BUILD=	yes
-PLIST=		${WRKDIR}/pkg-plist
 USE_PERL5=	yes
 
 .include <bsd.port.pre.mk>
 
-pre-install:
-	${ECHO_CMD} bin/fetchyahoo > ${PLIST}
-.if !defined(NOPORTDOCS)
-	${ECHO_CMD} share/examples/fetchyahoo/fetchyahoorc >> ${PLIST}
-.for ii in ${DOCS}
-	${ECHO_CMD} share/doc/fetchyahoo/${ii} >> ${PLIST}
-.endfor
+.if ${PERL_LEVEL} < 500800
+RUN_DEPENDS+=	${SITE_PERL}/Net/Cmd.pm:${PORTSDIR}/net/p5-Net
 .endif
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/fetchyahoo ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
+	@${INSTALL_SCRIPT} ${WRKSRC}/fetchyahoo ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/fetchyahoorc ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fetchyahoorc ${EXAMPLESDIR}
-.for ii in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.for ii in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}
 .endfor
 .endif