diff --git a/devel/p5-Test-WWW-Mechanize/Makefile b/devel/p5-Test-WWW-Mechanize/Makefile
index ae062e03b1c..06d8a20219b 100644
--- a/devel/p5-Test-WWW-Mechanize/Makefile
+++ b/devel/p5-Test-WWW-Mechanize/Makefile
@@ -1,25 +1,28 @@
-COMMENT=	test suite using WWW::Mechanize
+COMMENT =	test suite using WWW::Mechanize
 
-MODULES=	cpan
-PKG_ARCH=	*
+DISTNAME =	Test-WWW-Mechanize-1.58
 
-DISTNAME =	Test-WWW-Mechanize-1.54
-CATEGORIES=	www devel
+CATEGORIES =	www devel
 
 # Artistic 2.0
-PERMIT_PACKAGE=	Yes
+PERMIT_PACKAGE =	Yes
+
+MODULES =		cpan
 
 # Can use p5-HTML-Tidy5 when available
-RUN_DEPENDS=	devel/p5-Carp-Assert-More>=1.16 \
-		devel/p5-Test-LongString>=0.15 \
-		www/p5-HTML-Form \
-		www/p5-HTML-Lint>=2.20 \
-		www/p5-HTML-Parser \
-		www/p5-HTTP-Server-Simple>=0.42 \
-		www/p5-URI \
-		www/p5-WWW-Mechanize>=1.68 \
-		www/p5-libwww>=6.02
+RUN_DEPENDS =		devel/p5-Carp-Assert-More>=1.16 \
+			devel/p5-Test-LongString>=0.15 \
+			www/p5-HTML-Form \
+			www/p5-HTML-Lint>=2.20 \
+			www/p5-HTML-Parser \
+			www/p5-HTTP-Message>=6.29 \
+			www/p5-HTTP-Server-Simple>=0.42 \
+			www/p5-URI \
+			www/p5-WWW-Mechanize>=1.68 \
+			www/p5-libwww>=6.02
 
-MAKE_ENV=	TEST_POD=Yes
+MAKE_ENV =		TEST_POD=Yes
+
+PKG_ARCH =		*
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-WWW-Mechanize/distinfo b/devel/p5-Test-WWW-Mechanize/distinfo
index 8778dea8186..6e9af99de77 100644
--- a/devel/p5-Test-WWW-Mechanize/distinfo
+++ b/devel/p5-Test-WWW-Mechanize/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Test-WWW-Mechanize-1.54.tar.gz) = 3KiLWxdBFL9apseC/58OzFDBRCuDJMEdORd1LqNDmvw=
-SIZE (Test-WWW-Mechanize-1.54.tar.gz) = 33848
+SHA256 (Test-WWW-Mechanize-1.58.tar.gz) = QfzRVKG4DTqHSz/AdX8Cuf4mHhnnkVar5S4IJPgRnVI=
+SIZE (Test-WWW-Mechanize-1.58.tar.gz) = 34970