diff --git a/devel/p5-Catalyst-Manual/Makefile b/devel/p5-Catalyst-Manual/Makefile
index 9f82ec3d542..23e8b4c1ec0 100644
--- a/devel/p5-Catalyst-Manual/Makefile
+++ b/devel/p5-Catalyst-Manual/Makefile
@@ -1,15 +1,21 @@
-# $OpenBSD: Makefile,v 1.6 2007/11/21 21:10:53 simon Exp $
+# $OpenBSD: Makefile,v 1.7 2009/02/02 00:30:56 simon Exp $
 
 COMMENT=	catalyst documentation
 
 MODULES=	cpan
-DISTNAME=	Catalyst-Manual-5.701003
+DISTNAME=	Catalyst-Manual-5.7016
 CATEGORIES=	devel
 
+# there was a version with six digits behind the dot and we need to pad
+# to that or updates would fail
+PKGNAME=	p5-${DISTNAME}00
+
 # perl
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MAKE_ENV+=	TEST_POD=1
+
 .include <bsd.port.mk>
diff --git a/devel/p5-Catalyst-Manual/distinfo b/devel/p5-Catalyst-Manual/distinfo
index a460e3e58b1..b0dca8105e8 100644
--- a/devel/p5-Catalyst-Manual/distinfo
+++ b/devel/p5-Catalyst-Manual/distinfo
@@ -1,5 +1,5 @@
-MD5 (Catalyst-Manual-5.701003.tar.gz) = U2P46rUK9eDJhe+J1xGvRA==
-RMD160 (Catalyst-Manual-5.701003.tar.gz) = ucGajL2+W0IwjzpJgeIwSKyempw=
-SHA1 (Catalyst-Manual-5.701003.tar.gz) = +ruOPLqVDzV+5zSMEKrufbpHav8=
-SHA256 (Catalyst-Manual-5.701003.tar.gz) = 5kn12AeaJ28dWh3Pp67Zp9QFJwqO0+rnY8n5bci9A+E=
-SIZE (Catalyst-Manual-5.701003.tar.gz) = 130529
+MD5 (Catalyst-Manual-5.7016.tar.gz) = dkVFXRWONisdNNyOZ4u+0Q==
+RMD160 (Catalyst-Manual-5.7016.tar.gz) = yip95UM2D8sEbn9rnClP+1uQ/LI=
+SHA1 (Catalyst-Manual-5.7016.tar.gz) = 7ikJFqJ3ghlAbYOKDi9MUH5G7gg=
+SHA256 (Catalyst-Manual-5.7016.tar.gz) = bgTEv59hB0uIlMdlfqdvhw4iKeLJZncsWH0o1gCysSs=
+SIZE (Catalyst-Manual-5.7016.tar.gz) = 146509
diff --git a/devel/p5-Catalyst-Manual/pkg/PLIST b/devel/p5-Catalyst-Manual/pkg/PLIST
index 6df3134cf8a..f2f1a0b2883 100644
--- a/devel/p5-Catalyst-Manual/pkg/PLIST
+++ b/devel/p5-Catalyst-Manual/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.4 2007/11/21 21:10:53 simon Exp $
+@comment $OpenBSD: PLIST,v 1.5 2009/02/02 00:30:56 simon Exp $
 ${P5SITE}/Catalyst/
 ${P5SITE}/Catalyst/Manual/
+@comment ${P5SITE}/Catalyst/Manual.pm
 ${P5SITE}/Catalyst/Manual/About.pod
 ${P5SITE}/Catalyst/Manual/Actions.pod
 ${P5SITE}/Catalyst/Manual/Cookbook.pod
@@ -11,7 +12,10 @@ ${P5SITE}/Catalyst/Manual/Intro.pod
 ${P5SITE}/Catalyst/Manual/Plugins.pod
 ${P5SITE}/Catalyst/Manual/Tutorial/
 ${P5SITE}/Catalyst/Manual/Tutorial.pod
+${P5SITE}/Catalyst/Manual/Tutorial/AdvancedCRUD/
 ${P5SITE}/Catalyst/Manual/Tutorial/AdvancedCRUD.pod
+${P5SITE}/Catalyst/Manual/Tutorial/AdvancedCRUD/FormBuilder.pod
+${P5SITE}/Catalyst/Manual/Tutorial/AdvancedCRUD/FormFu.pod
 ${P5SITE}/Catalyst/Manual/Tutorial/Appendices.pod
 ${P5SITE}/Catalyst/Manual/Tutorial/Authentication.pod
 ${P5SITE}/Catalyst/Manual/Tutorial/Authorization.pod
@@ -19,9 +23,10 @@ ${P5SITE}/Catalyst/Manual/Tutorial/BasicCRUD.pod
 ${P5SITE}/Catalyst/Manual/Tutorial/CatalystBasics.pod
 ${P5SITE}/Catalyst/Manual/Tutorial/Debugging.pod
 ${P5SITE}/Catalyst/Manual/Tutorial/Intro.pod
+${P5SITE}/Catalyst/Manual/Tutorial/MoreCatalystBasics.pod
 ${P5SITE}/Catalyst/Manual/Tutorial/Testing.pod
 ${P5SITE}/Catalyst/Manual/WritingPlugins.pod
-${P5SITE}/Catalyst/ManualPlaceholder.pm
+@comment @man man/man3p/Catalyst::Manual.3p
 @man man/man3p/Catalyst::Manual::About.3p
 @man man/man3p/Catalyst::Manual::Actions.3p
 @man man/man3p/Catalyst::Manual::Cookbook.3p
@@ -32,6 +37,8 @@ ${P5SITE}/Catalyst/ManualPlaceholder.pm
 @man man/man3p/Catalyst::Manual::Plugins.3p
 @man man/man3p/Catalyst::Manual::Tutorial.3p
 @man man/man3p/Catalyst::Manual::Tutorial::AdvancedCRUD.3p
+@man man/man3p/Catalyst::Manual::Tutorial::AdvancedCRUD::FormBuilder.3p
+@man man/man3p/Catalyst::Manual::Tutorial::AdvancedCRUD::FormFu.3p
 @man man/man3p/Catalyst::Manual::Tutorial::Appendices.3p
 @man man/man3p/Catalyst::Manual::Tutorial::Authentication.3p
 @man man/man3p/Catalyst::Manual::Tutorial::Authorization.3p
@@ -39,6 +46,6 @@ ${P5SITE}/Catalyst/ManualPlaceholder.pm
 @man man/man3p/Catalyst::Manual::Tutorial::CatalystBasics.3p
 @man man/man3p/Catalyst::Manual::Tutorial::Debugging.3p
 @man man/man3p/Catalyst::Manual::Tutorial::Intro.3p
+@man man/man3p/Catalyst::Manual::Tutorial::MoreCatalystBasics.3p
 @man man/man3p/Catalyst::Manual::Tutorial::Testing.3p
 @man man/man3p/Catalyst::Manual::WritingPlugins.3p
-@man man/man3p/Catalyst::ManualPlaceholder.3p