diff --git a/textproc/p5-Email-Find/Makefile b/textproc/p5-Email-Find/Makefile
new file mode 100644
index 00000000000..cde25986f9a
--- /dev/null
+++ b/textproc/p5-Email-Find/Makefile
@@ -0,0 +1,24 @@
+# $OpenBSD: Makefile,v 1.1 2004/04/24 16:13:50 peter Exp $
+
+COMMENT=		"Find RFC 822 email addresses in plain text"
+
+VERSION=		0.09
+DISTNAME=		Email-Find-${VERSION}
+PKGNAME=		p5-${DISTNAME}
+CATEGORIES=		textproc perl5
+
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Email/}
+
+MAINTAINER=		Peter Galbavy <peter.galbavy@knowtion.net>
+
+BUILD_DEPENDS=		::mail/p5-Mail-Tools ::mail/p5-Email-Valid
+RUN_DEPENDS=		${BUILD_DEPENDS}
+
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+CONFIGURE_STYLE=	perl
+
+.include <bsd.port.mk>
diff --git a/textproc/p5-Email-Find/distinfo b/textproc/p5-Email-Find/distinfo
new file mode 100644
index 00000000000..615a90110d1
--- /dev/null
+++ b/textproc/p5-Email-Find/distinfo
@@ -0,0 +1,3 @@
+MD5 (Email-Find-0.09.tar.gz) = 988182c9b5ec80861ee3749a434104ea
+RMD160 (Email-Find-0.09.tar.gz) = 41722a0dd05e782946a6d3faeea48fea566989c0
+SHA1 (Email-Find-0.09.tar.gz) = 4a093a8064bb8dea1dced8d3f410459ed3e8da75
diff --git a/textproc/p5-Email-Find/pkg/DESCR b/textproc/p5-Email-Find/pkg/DESCR
new file mode 100644
index 00000000000..325dbf3430b
--- /dev/null
+++ b/textproc/p5-Email-Find/pkg/DESCR
@@ -0,0 +1,8 @@
+Email::Find is a module for finding a subset of RFC 822 email
+addresses in arbitrary text. The addresses it finds are not guaranteed
+to exist or even actually be email addresses at all, but they will
+be valid RFC 822 syntax.
+
+Email::Find will perform some heuristics to avoid some of the more
+obvious red herrings and false addresses, but there's only so much
+which can be done without a human.
diff --git a/textproc/p5-Email-Find/pkg/PLIST b/textproc/p5-Email-Find/pkg/PLIST
new file mode 100644
index 00000000000..e16e32a8533
--- /dev/null
+++ b/textproc/p5-Email-Find/pkg/PLIST
@@ -0,0 +1,12 @@
+@comment $OpenBSD: PLIST,v 1.1 2004/04/24 16:13:50 peter Exp $
+${P5SITE}/Email/Find.pm
+${P5SITE}/Email/Find/addrspec.pm
+@comment ${P5ARCH}/auto/Email/Find/.packlist
+man/man3p/Email::Find.3p
+man/man3p/Email::Find::addrspec.3p
+@comment @dirrm ${P5ARCH}/auto/Email/Find
+@comment @dirrm ${P5ARCH}/auto/Email
+@comment @dirrm ${P5ARCH}/auto
+@comment @dirrm ${P5ARCH}
+@dirrm ${P5SITE}/Email/Find
+@comment @dirrm ${P5SITE}/Email