diff --git a/devel/p5-App-CLI/Makefile b/devel/p5-App-CLI/Makefile
new file mode 100644
index 00000000000..1d720b02a8d
--- /dev/null
+++ b/devel/p5-App-CLI/Makefile
@@ -0,0 +1,26 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2006/11/11 18:12:58 espie Exp $
+
+COMMENT= 	"dispatcher for command line interface programs"
+
+DISTNAME=	App-CLI-0.06
+PKGNAME=	p5-${DISTNAME}
+CATEGORIES=	www perl5
+
+# Artistic + GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=App/}
+
+RUN_DEPENDS=	::devel/p5-Locale-Maketext-Simple
+
+REGRESS_DEPENDS=${RUN_DEPENDS}
+
+CONFIGURE_STYLE=perl
+MAKE_ENV=	TEST_POD=Yes
+
+PKG_ARCH=	*
+
+.include <bsd.port.mk>
diff --git a/devel/p5-App-CLI/distinfo b/devel/p5-App-CLI/distinfo
new file mode 100644
index 00000000000..e394d3cd80b
--- /dev/null
+++ b/devel/p5-App-CLI/distinfo
@@ -0,0 +1,4 @@
+MD5 (App-CLI-0.06.tar.gz) = 93faf7836d0255569784f745837191c5
+RMD160 (App-CLI-0.06.tar.gz) = 4998734d144e11ee4008f956272eced76a2cd2bd
+SHA1 (App-CLI-0.06.tar.gz) = 02f174ae3c99aad3f1d90fbff44ee19518fbf735
+SIZE (App-CLI-0.06.tar.gz) = 26654
diff --git a/devel/p5-App-CLI/patches/patch-Makefile_PL b/devel/p5-App-CLI/patches/patch-Makefile_PL
new file mode 100644
index 00000000000..6fe40f54211
--- /dev/null
+++ b/devel/p5-App-CLI/patches/patch-Makefile_PL
@@ -0,0 +1,17 @@
+$OpenBSD: patch-Makefile_PL,v 1.1.1.1 2006/11/11 18:12:58 espie Exp $
+--- Makefile.PL.orig	Sat Nov 11 16:22:03 2006
++++ Makefile.PL	Sat Nov 11 16:22:16 2006
+@@ -8,11 +8,13 @@ abstract_from	('lib/App/CLI.pm');
+ license		('perl');
+ version_from	('lib/App/CLI.pm');
+ 
++=pod
+ requires(
+     'Locale::Maketext::Simple' => 0,
+     'Getopt::Long'             => '2.35',
+     'Pod::Simple::Text'        => 0,
+ );
++=cut
+ 
+ include('ExtUtils::AutoInstall');
+ auto_install();
diff --git a/devel/p5-App-CLI/pkg/DESCR b/devel/p5-App-CLI/pkg/DESCR
new file mode 100644
index 00000000000..8478dc43286
--- /dev/null
+++ b/devel/p5-App-CLI/pkg/DESCR
@@ -0,0 +1,3 @@
+App::CLI dispatches CLI (command line interface) based commands
+into command classes.  It also supports subcommand and per-command
+options.
diff --git a/devel/p5-App-CLI/pkg/PLIST b/devel/p5-App-CLI/pkg/PLIST
new file mode 100644
index 00000000000..732e920ced2
--- /dev/null
+++ b/devel/p5-App-CLI/pkg/PLIST
@@ -0,0 +1,9 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2006/11/11 18:12:58 espie Exp $
+${P5SITE}/App/
+${P5SITE}/App/CLI/
+${P5SITE}/App/CLI.pm
+${P5SITE}/App/CLI/Command/
+${P5SITE}/App/CLI/Command.pm
+${P5SITE}/App/CLI/Command/Help.pm
+@man man/man3p/App::CLI.3p
+@man man/man3p/App::CLI::Command.3p