diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index f76c8e3a9dd..487471ac778 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/22 08:36:48 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2011/03/28 23:04:42 simon Exp $
 
 COMMENT=		FastCGI Development Kit
 
 DISTNAME=		fcgi-2.4.0
-REVISION=		5
+REVISION=		6
 CATEGORIES=		www
 SHARED_LIBS +=	fcgi                 0.0      # .0.0
 SHARED_LIBS +=	fcgi++               1.0      # .1.0
diff --git a/www/fcgi/patches/patch-perl_FCGI_PL b/www/fcgi/patches/patch-perl_FCGI_PL
index 4f9d130a31b..863b9f63d57 100644
--- a/www/fcgi/patches/patch-perl_FCGI_PL
+++ b/www/fcgi/patches/patch-perl_FCGI_PL
@@ -1,6 +1,24 @@
-$OpenBSD: patch-perl_FCGI_PL,v 1.1 2008/06/01 20:39:26 simon Exp $
---- perl/FCGI.PL.orig	Fri May 23 07:12:42 2008
-+++ perl/FCGI.PL	Fri May 23 07:13:06 2008
+$OpenBSD: patch-perl_FCGI_PL,v 1.2 2011/03/28 23:04:42 simon Exp $
+--- perl/FCGI.PL.orig	Sun Dec 15 21:02:48 2002
++++ perl/FCGI.PL	Wed Mar  9 13:41:41 2011
+@@ -291,7 +291,7 @@ sub Request(;***$*$) {
+ 
+ sub accept() {
+     warn "accept called as a method; you probably wanted to call Accept" if @_;
+-    if (defined %FCGI::ENV) {
++    if (%FCGI::ENV) {
+ 	%ENV = %FCGI::ENV;
+     } else {
+ 	%FCGI::ENV = %ENV;
+@@ -310,7 +310,7 @@ sub accept() {
+ 
+ sub finish() {
+     warn "finish called as a method; you probably wanted to call Finish" if @_;
+-    %ENV = %FCGI::ENV if (defined %FCGI::ENV);
++    %ENV = %FCGI::ENV if (%FCGI::ENV);
+ 
+     # not SFIO
+     if (tied (*STDIN)) {
 @@ -393,7 +393,7 @@ sub OPEN {
  # Apparently some use fileno to determine if a filehandle is open,
  # so we might want to return a defined, but meaningless value.
diff --git a/www/fcgi/pkg/PLIST b/www/fcgi/pkg/PLIST
index 660b55c2692..8a5345b8094 100644
--- a/www/fcgi/pkg/PLIST
+++ b/www/fcgi/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2006/11/06 10:44:35 espie Exp $
-bin/cgi-fcgi
+@comment $OpenBSD: PLIST,v 1.5 2011/03/28 23:04:42 simon Exp $
+@bin bin/cgi-fcgi
 include/fastcgi.h
 include/fcgi_config.h
 include/fcgi_stdio.h