diff --git a/devel/p5-Error/Makefile b/devel/p5-Error/Makefile
index eb1b3266c89..c370b57948c 100644
--- a/devel/p5-Error/Makefile
+++ b/devel/p5-Error/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2010/10/18 17:48:00 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2010/10/25 11:05:32 jasper Exp $
 
 COMMENT=	error/exception handling in an OO-ish way
 
 MODULES=	cpan
-DISTNAME=	Error-0.17015
+DISTNAME=	Error-0.17016
 CATEGORIES=	devel
 USE_GROFF =	Yes
 
@@ -13,4 +13,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+CONFIGURE_STYLE=	modbuild
+
+MODCPAN_EXAMPLES=	Yes
+
 .include <bsd.port.mk>
diff --git a/devel/p5-Error/distinfo b/devel/p5-Error/distinfo
index 3f601f5792d..5bea6914064 100644
--- a/devel/p5-Error/distinfo
+++ b/devel/p5-Error/distinfo
@@ -1,5 +1,5 @@
-MD5 (Error-0.17015.tar.gz) = IDvEEK5QQOe2R6UqoPq6/g==
-RMD160 (Error-0.17015.tar.gz) = K+quzfrr19iRpdBjhqAkJ1dn0aI=
-SHA1 (Error-0.17015.tar.gz) = Dd43nyby1OuRRB7WE6QRxTRYi6M=
-SHA256 (Error-0.17015.tar.gz) = S9F3HmDL66PtE8fIEdiYmuiknURCUSzSeemYzWLORMM=
-SIZE (Error-0.17015.tar.gz) = 18053
+MD5 (Error-0.17016.tar.gz) = 7tzTxpcFaN0yCStTNDKO/w==
+RMD160 (Error-0.17016.tar.gz) = wZsqIL1LjDM8epHGRE1HU4JG8+o=
+SHA1 (Error-0.17016.tar.gz) = yGGtFehTO7v8bfuKmEyAw0YHK9I=
+SHA256 (Error-0.17016.tar.gz) = 8BOjPOM/Mk1v9zygdPNKoT8EvOwR5/kcggwue14Zeao=
+SIZE (Error-0.17016.tar.gz) = 20990
diff --git a/devel/p5-Error/pkg/PLIST b/devel/p5-Error/pkg/PLIST
index bdddb60cdf2..bf357931d3b 100644
--- a/devel/p5-Error/pkg/PLIST
+++ b/devel/p5-Error/pkg/PLIST
@@ -1,6 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.5 2006/07/12 07:06:42 steven Exp $
+@comment $OpenBSD: PLIST,v 1.6 2010/10/25 11:05:32 jasper Exp $
 ${P5SITE}/Error/
 ${P5SITE}/Error.pm
 ${P5SITE}/Error/Simple.pm
 @man man/man3p/Error.3p
 @man man/man3p/Error::Simple.3p
+share/examples/p5-Error/
+share/examples/p5-Error/example.pl
+share/examples/p5-Error/next-in-loop/
+share/examples/p5-Error/next-in-loop/Error.pm-eval.pl
+share/examples/p5-Error/next-in-loop/Error.pm-next-label.pl
+share/examples/p5-Error/next-in-loop/Error.pm-next-out-of-catch.pl
+share/examples/p5-Error/next-in-loop/Error.pm-next.pl
+share/examples/p5-Error/next-in-loop/README
+share/examples/p5-Error/warndie.pl