diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 77886c531b28b..c6321a371aeab 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.81 2011/08/05 19:38:47 spz Exp $
+# $NetBSD: Makefile,v 1.82 2012/03/04 13:49:04 abs Exp $
 
-DISTNAME=	libwww-perl-6.02
+DISTNAME=	libwww-perl-6.04
 PKGNAME=	p5-${DISTNAME:S/-perl-/-/}
 SVR4_PKGNAME=	p5lww
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=WWW/}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/G/GA/GAAS/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/libwww-perl/
@@ -14,24 +14,35 @@ LICENSE=	${PERL5_LICENSE}
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+DEPENDS+=	{perl>=5.10,p5-Digest-MD5>=0}:../../security/p5-Digest-MD5
+#		Encode in perl 5.14
+DEPENDS+=	p5-Encode-Locale>=0:../../textproc/p5-Encode-Locale
+DEPENDS+=	p5-File-Listing>=6:../../devel/p5-File-Listing
+#		HTML::Entities in perl 5.14
+#		HTML::HeadParser in perl 5.14
+DEPENDS+=	p5-HTTP-Cookies>=6:../../www/p5-HTTP-Cookies
+DEPENDS+=	p5-HTTP-Daemon>=6:../../www/p5-HTTP-Daemon
+DEPENDS+=	p5-HTTP-Date>=6:../../www/p5-HTTP-Date
+DEPENDS+=	p5-HTTP-Negotiate>=6:../../www/p5-HTTP-Negotiate
+#		HTTP::{Request,Request::Common,Response,Status} in HTTP::Message
+DEPENDS+=	p5-HTTP-Message>=6:../../www/p5-HTTP-Message
+#		IO::Select in perl 5.14
+#		IO::Socket in perl 5.14
+DEPENDS+=	p5-LWP-MediaTypes>=6:../../www/p5-LWP-MediaTypes
+DEPENDS+=	p5-MIME-Base64>=2.1:../../converters/p5-MIME-Base64
+DEPENDS+=	{perl>=5.10,p5-Net>=1.09}:../../net/p5-Net # for Net::FTP>=2.58
+DEPENDS+=	p5-Net-HTTP>=6:../../www/p5-Net-HTTP
+DEPENDS+=	p5-URI>=1.10:../../www/p5-URI
+#		URI::Escape in URI
+DEPENDS+=	p5-WWW-RobotRules>=6.01:../../www/p5-WWW-RobotRules
+
+# Optionals
+DEPENDS+=	p5-LWP-Protocol-https>=6.02:../../www/p5-LWP-Protocol-https
 DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 DEPENDS+=	p5-Crypt-SSLeay>=0:../../security/p5-Crypt-SSLeay
-DEPENDS+=	{perl>=5.10,p5-Digest-MD5-[0-9]*}:../../security/p5-Digest-MD5
 DEPENDS+=	p5-HTML-Parser>=3.33:../../www/p5-HTML-Parser
 DEPENDS+=	p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
 DEPENDS+=	p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
-DEPENDS+=	p5-MIME-Base64>=2.1:../../converters/p5-MIME-Base64
-DEPENDS+=	{perl>=5.10,p5-Net>=1.09}:../../net/p5-Net		# for Net::FTP>=2.58
-DEPENDS+=	p5-URI>=1.10:../../www/p5-URI
-DEPENDS+=	p5-File-Listing>=6.02:../../devel/p5-File-Listing
-DEPENDS+=	p5-HTTP-Message>=6.02:../../www/p5-HTTP-Message
-DEPENDS+=	p5-HTTP-Cookies>=6.00:../../www/p5-HTTP-Cookies
-DEPENDS+=	p5-HTTP-Daemon>=6.00:../../www/p5-HTTP-Daemon
-DEPENDS+=	p5-HTTP-Negotiate>=6.00:../../www/p5-HTTP-Negotiate
-DEPENDS+=	p5-Net-HTTP>=6.01:../../www/p5-Net-HTTP
-DEPENDS+=	p5-WWW-RobotRules>=6.01:../../www/p5-WWW-RobotRules
-# it would run without the following, but not do any https then
-DEPENDS+=	p5-LWP-Protocol-https>=6.02:../../www/p5-LWP-Protocol-https
 
 USE_LANGUAGES=		# empty
 
diff --git a/www/p5-libwww/distinfo b/www/p5-libwww/distinfo
index 465afa8e7e53e..144ac50eedab4 100644
--- a/www/p5-libwww/distinfo
+++ b/www/p5-libwww/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.38 2011/08/05 19:38:47 spz Exp $
+$NetBSD: distinfo,v 1.39 2012/03/04 13:49:04 abs Exp $
 
-SHA1 (libwww-perl-6.02.tar.gz) = 211393d014a9c991e572138aaaf367d10ea7103e
-RMD160 (libwww-perl-6.02.tar.gz) = 741b292c6adbe70b6b33827606b8df0786a09922
-Size (libwww-perl-6.02.tar.gz) = 130344 bytes
+SHA1 (libwww-perl-6.04.tar.gz) = e61e33aeff9874e1727e1ebd74f691093bc4b77e
+RMD160 (libwww-perl-6.04.tar.gz) = 7407e138ed2e086f1498e014f6d65a472115d43b
+Size (libwww-perl-6.04.tar.gz) = 132382 bytes