diff --git a/www/p5-CGI.pm/Makefile b/www/p5-CGI.pm/Makefile
index 1d47546f260a..43eb6c6d1fb0 100644
--- a/www/p5-CGI.pm/Makefile
+++ b/www/p5-CGI.pm/Makefile
@@ -1,49 +1,50 @@
 # New ports collection makefile for:	www/p5-CGI.pm
 # Date created:				12 July 2001
 # Whom:					Anton Berezin <tobez@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	CGI.pm
 PORTVERSION=	3.37
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CGI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Simple Common Gateway Interface Class for Perl
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 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
 
 post-patch:
 	@${REINPLACE_CMD} -e '/require 5\.6/d; /INSTALLDIRS/d' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI.pm/files/patch-bug-34551 b/www/p5-CGI.pm/files/patch-bug-34551
new file mode 100644
index 000000000000..4701387beaca
--- /dev/null
+++ b/www/p5-CGI.pm/files/patch-bug-34551
@@ -0,0 +1,11 @@
+--- CGI.pm.orig	2008-05-13 09:32:19.000000000 +0200
++++ CGI.pm	2008-05-13 09:32:59.000000000 +0200
+@@ -3387,7 +3387,7 @@ sub read_multipart {
+         # content-disposition parsing fail.
+         my ($filename) = $header{'Content-Disposition'}
+ 	               =~/ filename=(("[^"]*")|([a-z\d!\#'\*\+,\.^_\`\{\}\|\~]*))/i;
+-        $filename =~ s/^"([^"]*)"$/$1/;
++        $filename =~ s/^"([^"]*)"$/$1/ if defined $filename;
+ 	# Test for Opera's multiple upload feature
+ 	my($multipart) = ( defined( $header{'Content-Type'} ) &&
+ 		$header{'Content-Type'} =~ /multipart\/mixed/ ) ?