diff --git a/converters/p5-JSON/Makefile b/converters/p5-JSON/Makefile
index c1c6573c2e4..97753ee4f37 100644
--- a/converters/p5-JSON/Makefile
+++ b/converters/p5-JSON/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2007/09/16 01:40:28 merdely Exp $
+# $OpenBSD: Makefile,v 1.6 2008/06/09 18:58:47 simon Exp $
 
 COMMENT= 	parse and convert to JSON (JavaScript Object Notation)
 
-DISTNAME=	JSON-1.14
+DISTNAME=	JSON-2.10
 CATEGORIES=	converters
 MODULES=	cpan
 
@@ -14,8 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
-
 RUN_DEPENDS=	::www/p5-libwww
+REGRESS_DEPENDS=::converters/p5-JSON-XS
 
 .include <bsd.port.mk>
diff --git a/converters/p5-JSON/distinfo b/converters/p5-JSON/distinfo
index b51e8d3ce8f..220f8385bf1 100644
--- a/converters/p5-JSON/distinfo
+++ b/converters/p5-JSON/distinfo
@@ -1,5 +1,5 @@
-MD5 (JSON-1.14.tar.gz) = 2V2c23wKZKUdPZRpFdtS+w==
-RMD160 (JSON-1.14.tar.gz) = 4a1LtzJi6osb/BQXDpUHIlIN6x4=
-SHA1 (JSON-1.14.tar.gz) = kssq7dS8Q/8tWiir8F35rP9qA30=
-SHA256 (JSON-1.14.tar.gz) = aEDJIIu1uBIbLazrTbeU3ILxUKcnuvYOxroYbtmeqOI=
-SIZE (JSON-1.14.tar.gz) = 36432
+MD5 (JSON-2.10.tar.gz) = nW1REmAHOaCf8mPWNOBx4A==
+RMD160 (JSON-2.10.tar.gz) = SBmLJXjs80oD5Vb0ZKNO8x0JnvU=
+SHA1 (JSON-2.10.tar.gz) = AjnBFNiuSfl4Fd96LBS3Vo+fkwA=
+SHA256 (JSON-2.10.tar.gz) = mutjhLWDAY7+qxXkCiMQ+mtrPyXrmhgABOXX9zrmqmU=
+SIZE (JSON-2.10.tar.gz) = 67197
diff --git a/converters/p5-JSON/pkg/PLIST b/converters/p5-JSON/pkg/PLIST
index 354c5ddaba5..630a891e0da 100644
--- a/converters/p5-JSON/pkg/PLIST
+++ b/converters/p5-JSON/pkg/PLIST
@@ -1,23 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.3 2007/06/04 11:47:09 aanriot Exp $
-${P5SITE}/Apache/
-${P5SITE}/Apache/JSONRPC.pm
+@comment $OpenBSD: PLIST,v 1.4 2008/06/09 18:58:48 simon Exp $
 ${P5SITE}/JSON/
 ${P5SITE}/JSON.pm
-${P5SITE}/JSON/Converter.pm
+${P5SITE}/JSON/PP/
 ${P5SITE}/JSON/PP.pm
+${P5SITE}/JSON/PP/Boolean.pm
 ${P5SITE}/JSON/PP5005.pm
 ${P5SITE}/JSON/PP56.pm
-${P5SITE}/JSON/Parser.pm
-${P5SITE}/JSONRPC/
-${P5SITE}/JSONRPC.pm
-${P5SITE}/JSONRPC/Transport/
-${P5SITE}/JSONRPC/Transport/HTTP.pm
-@man man/man3p/Apache::JSONRPC.3p
+${P5SITE}/JSON/PP58.pm
 @man man/man3p/JSON.3p
-@man man/man3p/JSON::Converter.3p
 @man man/man3p/JSON::PP.3p
 @man man/man3p/JSON::PP5005.3p
 @man man/man3p/JSON::PP56.3p
-@man man/man3p/JSON::Parser.3p
-@man man/man3p/JSONRPC.3p
-@man man/man3p/JSONRPC::Transport::HTTP.3p
+@man man/man3p/JSON::PP58.3p
+@man man/man3p/JSON::PP::Boolean.3p