diff --git a/www/p5-CGI.pm/Makefile b/www/p5-CGI.pm/Makefile
index 4e960ae41cc1..f52179f86020 100644
--- a/www/p5-CGI.pm/Makefile
+++ b/www/p5-CGI.pm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	CGI.pm
 PORTVERSION=	3.05
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
@@ -23,6 +24,24 @@ MAN3=		CGI.3 CGI::Apache.3 CGI::Carp.3 CGI::Cookie.3 \
 		CGI::Fast.3 CGI::Pretty.3 CGI::Push.3 CGI::Switch.3 \
 		CGI::Util.3
 
+.if !defined(NOPORTDOCS)
+EXAMPLES=	examples/caution.xbm examples/clickable_image.cgi \
+		examples/cookie.cgi examples/crash.cgi examples/customize.cgi \
+		examples/diff_upload.cgi examples/dna.small.gif \
+		examples/file_upload.cgi examples/frameset.cgi \
+		examples/index.html examples/internal_links.cgi \
+		examples/javascript.cgi examples/make_links.pl \
+		examples/monty.cgi examples/multiple_forms.cgi \
+		examples/nph-clock.cgi examples/nph-multipart.cgi \
+		examples/popup.cgi examples/save_state.cgi \
+		examples/tryit.cgi examples/wilogo.gif
+
+post-install:
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/|} ${EXAMPLESDIR}
+	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
diff --git a/www/p5-CGI.pm/pkg-plist b/www/p5-CGI.pm/pkg-plist
index a483c3b52cde..00e8184d7093 100644
--- a/www/p5-CGI.pm/pkg-plist
+++ b/www/p5-CGI.pm/pkg-plist
@@ -8,5 +8,27 @@
 %%SITE_PERL%%/CGI/Switch.pm
 %%SITE_PERL%%/CGI/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/.packlist
+%%PORTDOCS%%%%EXAMPLESDIR%%/caution.xbm
+%%PORTDOCS%%%%EXAMPLESDIR%%/clickable_image.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/cookie.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/crash.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/customize.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/diff_upload.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/dna.small.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/file_upload.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/frameset.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/index.html
+%%PORTDOCS%%%%EXAMPLESDIR%%/internal_links.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/javascript.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/make_links.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/monty.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/multiple_forms.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/nph-clock.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/nph-multipart.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/popup.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/save_state.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/tryit.cgi
+%%PORTDOCS%%%%EXAMPLESDIR%%/wilogo.gif
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true