diff --git a/www/Makefile b/www/Makefile
index 7ce83f83514e..9e94e6a7b4cc 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -600,6 +600,7 @@
     SUBDIR += p5-POE-Component-Client-UserAgent
     SUBDIR += p5-POE-Component-Server-HTTP
     SUBDIR += p5-POE-Component-Server-HTTPServer
+    SUBDIR += p5-POE-Component-Server-SimpleHTTP
     SUBDIR += p5-ParallelUA
     SUBDIR += p5-PodToHTML
     SUBDIR += p5-Sledge
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/Makefile b/www/p5-POE-Component-Server-SimpleHTTP/Makefile
new file mode 100644
index 000000000000..01cd67e8b5cd
--- /dev/null
+++ b/www/p5-POE-Component-Server-SimpleHTTP/Makefile
@@ -0,0 +1,52 @@
+# New ports collection makefile for:	www/p5-POE-Component-Server-SimpleHTTP
+# Date created:				12 October 2005
+# Whom:					Lars Thegler <lth@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	POE-Component-Server-SimpleHTTP
+PORTVERSION=	1.11
+CATEGORIES=	www perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	POE
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	lth@FreeBSD.org
+COMMENT=	Perl extension to serve HTTP requests in POE
+
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
+		${SITE_PERL}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+PERL_CONFIGURE=	yes
+
+MAN3=		POE::Component::Server::SimpleHTTP.3 \
+		POE::Component::Server::SimpleHTTP::Connection.3 \
+		POE::Component::Server::SimpleHTTP::PreFork.3 \
+		POE::Component::Server::SimpleHTTP::Response.3
+
+OPTIONS=	SSL "SSL support (POE::Component::SSLify)" on \
+		PREFORK "PreFork support (IRC::Shareable)" on
+
+.include <bsd.port.pre.mk>
+
+.ifdef(WITH_SSL)
+BUILD_DEPENDS+=	${SITE_PERL}/POE/Component/SSLify.pm:${PORTSDIR}/security/p5-POE-Component-SSLify
+.endif
+
+.ifdef(WITH_PREFORK)
+BUILD_DEPENDS+=	${SITE_PERL}/IPC/Shareable.pm:${PORTSDIR}/devel/p5-IPC-Shareable
+.endif
+
+.if ${PERL_LEVEL} < 500600
+EXTRA_PATCHES=	${FILESDIR}/500503-*
+
+post-patch:
+	@${PERL} -pi -e 's/^our ([\$$\@]\w+)/use vars qw($$1); $$1/;' \
+		     -e '$$_ = "" if /use warnings/;' \
+		$$(${FIND} ${WRKSRC} -name '*.pm')
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/distinfo b/www/p5-POE-Component-Server-SimpleHTTP/distinfo
new file mode 100644
index 000000000000..da3087b17ce8
--- /dev/null
+++ b/www/p5-POE-Component-Server-SimpleHTTP/distinfo
@@ -0,0 +1,2 @@
+MD5 (POE-Component-Server-SimpleHTTP-1.11.tar.gz) = dec01e04284b5acda6d706018b1f499c
+SIZE (POE-Component-Server-SimpleHTTP-1.11.tar.gz) = 22041
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/files/500503-lib_POE_Component_Server_SimpleHTTP.pm b/www/p5-POE-Component-Server-SimpleHTTP/files/500503-lib_POE_Component_Server_SimpleHTTP.pm
new file mode 100644
index 000000000000..929e1815d4a6
--- /dev/null
+++ b/www/p5-POE-Component-Server-SimpleHTTP/files/500503-lib_POE_Component_Server_SimpleHTTP.pm
@@ -0,0 +1,38 @@
+--- lib/POE/Component/Server/SimpleHTTP.pm.orig	Wed Oct 12 14:07:14 2005
++++ lib/POE/Component/Server/SimpleHTTP.pm	Wed Oct 12 14:08:57 2005
+@@ -542,7 +542,7 @@
+ 		}
+ 
+ 		# Destroy this wheel!
+-		delete $_[HEAP]->{'REQUESTS'}->{ $id }->[0];
++		$_[HEAP]->{'REQUESTS'}->{ $id }->[0] = undef;
+ 		delete $_[HEAP]->{'REQUESTS'}->{ $id };
+ 
+ 		# All done!
+@@ -614,7 +614,7 @@
+ 	# Check if the SimpleHTTP::Connection object croaked ( happens when sockets just disappear )
+ 	if ( ! defined $response->{'CONNECTION'} ) {
+ 		# Destroy this wheel!
+-		delete $_[HEAP]->{'REQUESTS'}->{ $id }->[0];
++		$_[HEAP]->{'REQUESTS'}->{ $id }->[0] = undef;
+ 		delete $_[HEAP]->{'REQUESTS'}->{ $id };
+ 
+ 		# All done!
+@@ -671,7 +671,7 @@
+ 
+ 		# Delete the wheel
+ 		# Tracked down by Paul Visscher
+-		delete $_[HEAP]->{'REQUESTS'}->{ $id }->[0];
++		$_[HEAP]->{'REQUESTS'}->{ $id }->[0] = undef;
+ 		delete $_[HEAP]->{'REQUESTS'}->{ $id };
+ 	} else {
+ 		# Ignore this, eh?
+@@ -823,7 +823,7 @@
+ 	}
+ 
+ 	# Delete it!
+-	delete $_[HEAP]->{'REQUESTS'}->{ $id }->[0];
++	$_[HEAP]->{'REQUESTS'}->{ $id }->[0] = undef;
+ 	delete $_[HEAP]->{'REQUESTS'}->{ $id };
+ 
+ 	# All done!
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/files/patch-Makefile.PL b/www/p5-POE-Component-Server-SimpleHTTP/files/patch-Makefile.PL
new file mode 100644
index 000000000000..1df0b70c092d
--- /dev/null
+++ b/www/p5-POE-Component-Server-SimpleHTTP/files/patch-Makefile.PL
@@ -0,0 +1,25 @@
+--- Makefile.PL.orig	Wed Oct 12 11:21:00 2005
++++ Makefile.PL	Wed Oct 12 11:21:16 2005
+@@ -16,22 +16,6 @@
+ 	'HTTP::Response'		=>	0,
+ };
+ 
+-# Ask users if they want SSL support
+-my $value = prompt( 'Do you want SSL support ( requires POE::Component::SSLify ) [Y/n]?', 'Y' );
+-
+-# Add to the prereqs PoCo::SSLify?
+-if ( $value =~ /^Y$/i ) {
+-	$prereqs->{ 'POE::Component::SSLify' } = '0.04';
+-}
+-
+-# Ask users if they want PreFork support
+-$value = prompt( 'Do you want PreFork support ( requires IPC::Shareable ) [Y/n]?', 'Y' );
+-
+-# Add to the prereqs IPC::Shareable?
+-if ( $value =~ /^Y$/i ) {
+-	$prereqs->{ 'IPC::Shareable' } = '0';
+-}
+-
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
+ WriteMakefile(
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/pkg-descr b/www/p5-POE-Component-Server-SimpleHTTP/pkg-descr
new file mode 100644
index 000000000000..29cb8efdbe65
--- /dev/null
+++ b/www/p5-POE-Component-Server-SimpleHTTP/pkg-descr
@@ -0,0 +1,3 @@
+This module makes serving up HTTP requests a breeze in POE.
+
+WWW: http://search.cpan.org/dist/POE-Component-Server-SimpleHTTP/
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist b/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist
new file mode 100644
index 000000000000..904dcd9bce23
--- /dev/null
+++ b/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist
@@ -0,0 +1,13 @@
+%%SITE_PERL%%/POE/Component/Server/SimpleHTTP.pm
+%%SITE_PERL%%/POE/Component/Server/SimpleHTTP/Connection.pm
+%%SITE_PERL%%/POE/Component/Server/SimpleHTTP/PreFork.pm
+%%SITE_PERL%%/POE/Component/Server/SimpleHTTP/Response.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SimpleHTTP/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SimpleHTTP
+@dirrm %%SITE_PERL%%/POE/Component/Server/SimpleHTTP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Server 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true