diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 5853338e0fa24..1162b4d1c0381 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2015/04/02 22:47:24 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2015/04/22 06:33:25 wiz Exp $
 
-DISTNAME=	CGI-4.14
+DISTNAME=	CGI-4.15
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	www perl5
 MASTER_SITES+=	${MASTER_SITE_PERL_CPAN:=CGI/}
@@ -23,14 +23,10 @@ REPLACE_PERL+=		examples/*.cgi
 HTMLDIR=		${PREFIX}/share/doc/p5-CGI
 INSTALLATION_DIRS=	${HTMLDIR}/examples
 
-post-build:
-	cd ${WRKSRC}/examples && chmod +x *.cgi && perl make_links.pl
-
 post-install:
 	cd ${WRKSRC}/examples && \
-	${INSTALL_DATA} *.gif *.html *.txt *.xbm \
-		${DESTDIR}${HTMLDIR}/examples && \
-	${INSTALL_SCRIPT} *.cgi ${DESTDIR}${HTMLDIR}/examples
+	${INSTALL_DATA} *.gif ${DESTDIR}${HTMLDIR}/examples && \
+	${INSTALL_SCRIPT} *.cgi *.pl ${DESTDIR}${HTMLDIR}/examples
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-CGI/PLIST b/www/p5-CGI/PLIST
index c173bf8775152..91595dbf26939 100644
--- a/www/p5-CGI/PLIST
+++ b/www/p5-CGI/PLIST
@@ -1,37 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2014/05/31 12:11:06 wiz Exp $
-share/doc/p5-CGI/examples/caution.xbm
+@comment $NetBSD: PLIST,v 1.6 2015/04/22 06:33:25 wiz Exp $
 share/doc/p5-CGI/examples/clickable_image.cgi
-share/doc/p5-CGI/examples/clickable_image.txt
 share/doc/p5-CGI/examples/cookie.cgi
-share/doc/p5-CGI/examples/cookie.txt
 share/doc/p5-CGI/examples/crash.cgi
-share/doc/p5-CGI/examples/crash.txt
-share/doc/p5-CGI/examples/customize.cgi
-share/doc/p5-CGI/examples/customize.txt
-share/doc/p5-CGI/examples/diff_upload.cgi
-share/doc/p5-CGI/examples/diff_upload.txt
-share/doc/p5-CGI/examples/dna.small.gif
 share/doc/p5-CGI/examples/file_upload.cgi
-share/doc/p5-CGI/examples/file_upload.txt
-share/doc/p5-CGI/examples/frameset.cgi
-share/doc/p5-CGI/examples/frameset.txt
-share/doc/p5-CGI/examples/index.html
-share/doc/p5-CGI/examples/internal_links.cgi
-share/doc/p5-CGI/examples/internal_links.txt
-share/doc/p5-CGI/examples/javascript.cgi
-share/doc/p5-CGI/examples/javascript.txt
-share/doc/p5-CGI/examples/monty.cgi
-share/doc/p5-CGI/examples/monty.txt
-share/doc/p5-CGI/examples/multiple_forms.cgi
-share/doc/p5-CGI/examples/multiple_forms.txt
-share/doc/p5-CGI/examples/nph-clock.cgi
-share/doc/p5-CGI/examples/nph-clock.txt
-share/doc/p5-CGI/examples/nph-multipart.cgi
-share/doc/p5-CGI/examples/nph-multipart.txt
-share/doc/p5-CGI/examples/popup.cgi
-share/doc/p5-CGI/examples/popup.txt
-share/doc/p5-CGI/examples/save_state.cgi
-share/doc/p5-CGI/examples/save_state.txt
-share/doc/p5-CGI/examples/tryit.cgi
-share/doc/p5-CGI/examples/tryit.txt
+share/doc/p5-CGI/examples/mojo_proxy.pl
+share/doc/p5-CGI/examples/wikipedia_example.cgi
 share/doc/p5-CGI/examples/wilogo.gif
diff --git a/www/p5-CGI/distinfo b/www/p5-CGI/distinfo
index 43c35b3fbbe92..4bee81dc17ce7 100644
--- a/www/p5-CGI/distinfo
+++ b/www/p5-CGI/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.36 2015/04/02 22:47:24 wiz Exp $
+$NetBSD: distinfo,v 1.37 2015/04/22 06:33:25 wiz Exp $
 
-SHA1 (CGI-4.14.tar.gz) = 389ed544ebf026a95a3e56f4fd3e063d11e10ddb
-RMD160 (CGI-4.14.tar.gz) = 9d6085fe0d90dba22bbab510d9d4864bb40e5901
-Size (CGI-4.14.tar.gz) = 182727 bytes
+SHA1 (CGI-4.15.tar.gz) = 425bbfd5f92f499e5aa02e0f75ac1be1ce04cdfe
+RMD160 (CGI-4.15.tar.gz) = 4bc6f9f44dd018e810531de7236fadfdd9deda82
+Size (CGI-4.15.tar.gz) = 193740 bytes