diff --git a/mail/p5-Email-Simple/Makefile b/mail/p5-Email-Simple/Makefile
index 5ad98fcbe92..b3f84328818 100644
--- a/mail/p5-Email-Simple/Makefile
+++ b/mail/p5-Email-Simple/Makefile
@@ -1,18 +1,22 @@
-# $OpenBSD: Makefile,v 1.6 2009/11/03 13:27:43 stephan Exp $
+# $OpenBSD: Makefile,v 1.7 2010/01/08 10:38:30 stephan Exp $
 
-COMMENT=	simple module for handling email messages
+COMMENT =	simple module for handling email messages
 
-MODULES=	cpan
-DISTNAME=	Email-Simple-2.005
-PKGNAME=	p5-${DISTNAME}p0
-CATEGORIES=	mail
+MODULES =	cpan
+DISTNAME =	Email-Simple-2.100
+CATEGORIES =	mail
 
-MAINTAINER=	Stephan A. Rickauer <stephan@openbsd.org>
+MAINTAINER =	Stephan A. Rickauer <stephan@openbsd.org>
 
-# Same as Perl
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
+# Perl
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+RUN_DEPENDS =		::mail/p5-Email-Date-Format
+BUILD_DEPENDS = 	${RUN_DEPENDS}
+
+MAKE_ENV =		TEST_POD=Yes
 
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Simple/distinfo b/mail/p5-Email-Simple/distinfo
index 1c0c44ac011..8a839df3fca 100644
--- a/mail/p5-Email-Simple/distinfo
+++ b/mail/p5-Email-Simple/distinfo
@@ -1,5 +1,5 @@
-MD5 (Email-Simple-2.005.tar.gz) = lFqKSHunrqkJsBuEzrHGeA==
-RMD160 (Email-Simple-2.005.tar.gz) = lSEkrsHqXhSLgH7wTOcM7Gk3om4=
-SHA1 (Email-Simple-2.005.tar.gz) = fVubsTJqbFHFJyrah+duBRs8Yew=
-SHA256 (Email-Simple-2.005.tar.gz) = k+GE9dVPtM6LUPxMWuc4L4X/AviimryvN5UHrfnDArY=
-SIZE (Email-Simple-2.005.tar.gz) = 28471
+MD5 (Email-Simple-2.100.tar.gz) = OCBUAPm2tfHZtq5FGDy3Hw==
+RMD160 (Email-Simple-2.100.tar.gz) = PddKzJTSa5MkrLNdQ71FUq6NKlY=
+SHA1 (Email-Simple-2.100.tar.gz) = DF0hIkbF11hz/n0Gc/ufeMLVlwI=
+SHA256 (Email-Simple-2.100.tar.gz) = CWrXYK0oPlYAw/n9TY5jgBAE+spu2sVg4y0sXXK6BuE=
+SIZE (Email-Simple-2.100.tar.gz) = 31007
diff --git a/mail/p5-Email-Simple/pkg/PLIST b/mail/p5-Email-Simple/pkg/PLIST
index e2bfc2955bf..33769c85203 100644
--- a/mail/p5-Email-Simple/pkg/PLIST
+++ b/mail/p5-Email-Simple/pkg/PLIST
@@ -1,7 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.3 2009/08/25 17:15:34 jasper Exp $
-${P5SITE}/Email/
+@comment $OpenBSD: PLIST,v 1.4 2010/01/08 10:38:30 stephan Exp $
+@conflict p5-Email-Simple-Creator-*
+@pkgpath mail/p5-Email-Simple-Creator
 ${P5SITE}/Email/Simple/
 ${P5SITE}/Email/Simple.pm
+${P5SITE}/Email/Simple/Creator.pm
 ${P5SITE}/Email/Simple/Header.pm
 @man man/man3p/Email::Simple.3p
+@man man/man3p/Email::Simple::Creator.3p
 @man man/man3p/Email::Simple::Header.3p