diff --git a/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile
index cf8d7cb0b73..c23736e5f3e 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -1,24 +1,22 @@
-# $OpenBSD: Makefile,v 1.10 2006/11/13 09:43:25 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2006/11/21 18:33:09 jasper Exp $
 
 COMMENT=	"perl interface to ZIP files"
 
 MODULES=	cpan
 
-DISTNAME=	Archive-Zip-1.16
-PKGNAME=	p5-${DISTNAME}p0
+DISTNAME=	Archive-Zip-1.18
 
 CATEGORIES=	archivers
 
-MAINTAINER=	Jasper Lievisse Adriaanse <jasper@nedbsd.nl>
-
 # Perl
-PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
+PERMIT_DISTFILES_FTP=	Yes
 
-RUN_DEPENDS=	:p5-Compress-Zlib-*:archivers/p5-Compress-Zlib
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	::archivers/p5-Compress-Zlib
 REGRESS_DEPENDS=:zip-*:archivers/zip \
-		::devel/p5-Test-Pod
+ 		::devel/p5-Test-Pod
 
 .include <bsd.port.mk>
diff --git a/archivers/p5-Archive-Zip/distinfo b/archivers/p5-Archive-Zip/distinfo
index f34ba7e4e70..3ebbe8ba9e2 100644
--- a/archivers/p5-Archive-Zip/distinfo
+++ b/archivers/p5-Archive-Zip/distinfo
@@ -1,4 +1,4 @@
-MD5 (Archive-Zip-1.16.tar.gz) = e28dff400d07b1659d659d8dde7071f1
-RMD160 (Archive-Zip-1.16.tar.gz) = aeacb97732dd13138405db49acbc851448863f58
-SHA1 (Archive-Zip-1.16.tar.gz) = 5eadeb821341e8491014003694aeb4380f3f39ae
-SIZE (Archive-Zip-1.16.tar.gz) = 111336
+MD5 (Archive-Zip-1.18.tar.gz) = b198ee6700e27203c071803216dba11c
+RMD160 (Archive-Zip-1.18.tar.gz) = 134f19c38ff3eebc50142f0abc64a501dff58c65
+SHA1 (Archive-Zip-1.18.tar.gz) = b3f4f405f743d9251ccd48f80b9f72a8654677e9
+SIZE (Archive-Zip-1.18.tar.gz) = 224031
diff --git a/archivers/p5-Archive-Zip/patches/patch-Makefile_PL b/archivers/p5-Archive-Zip/patches/patch-Makefile_PL
new file mode 100644
index 00000000000..86aec84fc1e
--- /dev/null
+++ b/archivers/p5-Archive-Zip/patches/patch-Makefile_PL
@@ -0,0 +1,11 @@
+--- Makefile.PL.orig	Wed Oct 25 14:18:49 2006
++++ Makefile.PL	Tue Nov 21 19:11:51 2006
+@@ -22,7 +22,7 @@ WriteMakefile(
+ 		'File::Spec'     => '0.80', # need splitpath()
+ 		'File::Copy'     => 0,
+ 		'File::Temp'     => 0,
+-		'File::Which'    => '0.05', # Should really be build_requires
++#		'File::Which'    => '0.05', # Not really needed
+ 		# 'Getopt::Std'    => 0,      # examples/extract.pl
+ 		'IO::File'       => 0,
+ 		'IO::Handle'     => 0,
diff --git a/archivers/p5-Archive-Zip/patches/patch-t-common_pl b/archivers/p5-Archive-Zip/patches/patch-t-common_pl
new file mode 100644
index 00000000000..40997d49845
--- /dev/null
+++ b/archivers/p5-Archive-Zip/patches/patch-t-common_pl
@@ -0,0 +1,14 @@
+--- t/common.pl.orig	Wed Oct 25 14:18:49 2006
++++ t/common.pl	Tue Nov 21 19:09:17 2006
+@@ -6,9 +6,8 @@ use constant INPUTZIP  => 'testin.zip';
+ use constant OUTPUTZIP => 'testout.zip';
+ 
+ # Do we have the 'zip' and 'unzip' programs?
+-use File::Which ();
+-use constant HAVEZIP   => !! File::Which::which('zip');
+-use constant HAVEUNZIP => !! File::Which::which('unzip');
++use constant HAVEZIP   => '1';
++use constant HAVEUNZIP => '1';
+ 
+ use constant ZIP     => 'zip ';
+ use constant ZIPTEST => 'unzip -t ';
diff --git a/archivers/p5-Archive-Zip/pkg/PLIST b/archivers/p5-Archive-Zip/pkg/PLIST
index f4e94dca8ab..c9ffcc03727 100644
--- a/archivers/p5-Archive-Zip/pkg/PLIST
+++ b/archivers/p5-Archive-Zip/pkg/PLIST
@@ -1,14 +1,20 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/09/14 23:12:43 espie Exp $
+@comment $OpenBSD: PLIST,v 1.7 2006/11/21 18:33:09 jasper Exp $
 bin/crc32
 ${P5SITE}/Archive/
 ${P5SITE}/Archive/Zip/
 ${P5SITE}/Archive/Zip.pm
-@comment ${P5SITE}/Archive/Zip.pod
+${P5SITE}/Archive/Zip/Archive.pm
 ${P5SITE}/Archive/Zip/BufferedFileHandle.pm
+${P5SITE}/Archive/Zip/DirectoryMember.pm
 @comment ${P5SITE}/Archive/Zip/FAQ.pod
+${P5SITE}/Archive/Zip/FileMember.pm
+${P5SITE}/Archive/Zip/Member.pm
 ${P5SITE}/Archive/Zip/MemberRead.pm
 ${P5SITE}/Archive/Zip/MockFileHandle.pm
+${P5SITE}/Archive/Zip/NewFileMember.pm
+${P5SITE}/Archive/Zip/StringMember.pm
 ${P5SITE}/Archive/Zip/Tree.pm
+${P5SITE}/Archive/Zip/ZipFileMember.pm
 @man man/man3p/Archive::Zip.3p
 @man man/man3p/Archive::Zip::FAQ.3p
 @man man/man3p/Archive::Zip::MemberRead.3p