diff --git a/www/p5-CGI-Emulate-PSGI/Makefile b/www/p5-CGI-Emulate-PSGI/Makefile
new file mode 100644
index 00000000000..02c599876e4
--- /dev/null
+++ b/www/p5-CGI-Emulate-PSGI/Makefile
@@ -0,0 +1,16 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2011/06/14 12:04:11 robert Exp $
+
+COMMENT=	PSGI adapter for CGI
+
+MODULES=	cpan
+DISTNAME=	CGI-Emulate-PSGI-0.11
+CATEGORIES=	www
+USE_GROFF=	Yes
+
+# Perl
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+
+.include <bsd.port.mk>
diff --git a/www/p5-CGI-Emulate-PSGI/distinfo b/www/p5-CGI-Emulate-PSGI/distinfo
new file mode 100644
index 00000000000..91452c76cf1
--- /dev/null
+++ b/www/p5-CGI-Emulate-PSGI/distinfo
@@ -0,0 +1,5 @@
+MD5 (CGI-Emulate-PSGI-0.11.tar.gz) = 2pFSReOntMcMOTW/aIsxsQ==
+RMD160 (CGI-Emulate-PSGI-0.11.tar.gz) = GF8+pIFHhAEs4UpC+RYU3ZYqGYw=
+SHA1 (CGI-Emulate-PSGI-0.11.tar.gz) = /AisylstkjXTHn8CJEwEPcE3vB8=
+SHA256 (CGI-Emulate-PSGI-0.11.tar.gz) = WF/Iu4pIvnsZYBvubbPnF9XpElGh1Wj3k5GwDiZ4Z4s=
+SIZE (CGI-Emulate-PSGI-0.11.tar.gz) = 29654
diff --git a/www/p5-CGI-Emulate-PSGI/pkg/DESCR b/www/p5-CGI-Emulate-PSGI/pkg/DESCR
new file mode 100644
index 00000000000..b80b881b401
--- /dev/null
+++ b/www/p5-CGI-Emulate-PSGI/pkg/DESCR
@@ -0,0 +1,3 @@
+This module allows an application designed for the
+CGI environment to run in a PSGI environment, and
+thus on any of the backends that PSGI supports.
diff --git a/www/p5-CGI-Emulate-PSGI/pkg/PLIST b/www/p5-CGI-Emulate-PSGI/pkg/PLIST
new file mode 100644
index 00000000000..5ad2f243100
--- /dev/null
+++ b/www/p5-CGI-Emulate-PSGI/pkg/PLIST
@@ -0,0 +1,8 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2011/06/14 12:04:11 robert Exp $
+${P5SITE}/CGI/
+${P5SITE}/CGI/Emulate/
+${P5SITE}/CGI/Emulate/PSGI.pm
+${P5SITE}/CGI/Parse/
+${P5SITE}/CGI/Parse/PSGI.pm
+@man man/man3p/CGI::Emulate::PSGI.3p
+@man man/man3p/CGI::Parse::PSGI.3p