--- Slim/Formats/XML.pm.old	2009-03-23 20:59:53.000000000 +0000
+++ Slim/Formats/XML.pm	2009-03-23 21:00:02.000000000 +0000
@@ -13,7 +13,7 @@
 use strict;
 use File::Slurp;
 use HTML::Entities;
-use JSON::XS qw(from_json);
+use JSON::XS::VersionOneAndTwo;
 use Scalar::Util qw(weaken);
 use URI::Escape qw(uri_escape);
 use XML::Simple;
--- Slim/Plugin/LastFM/ProtocolHandler.pm.old	2009-03-23 20:54:42.000000000 +0000
+++ Slim/Plugin/LastFM/ProtocolHandler.pm	2009-03-23 20:55:15.000000000 +0000
@@ -7,7 +7,7 @@
 use strict;
 use base qw(Slim::Player::Protocols::HTTP);
 
-use JSON::XS qw(from_json);
+use JSON::XS::VersionOneAndTwo;
 use URI::Escape qw(uri_escape_utf8);
 
 use Slim::Player::Playlist;
--- Slim/Plugin/Sirius/ProtocolHandler.pm.old	2009-03-23 20:55:21.000000000 +0000
+++ Slim/Plugin/Sirius/ProtocolHandler.pm	2009-03-23 20:55:34.000000000 +0000
@@ -19,7 +19,7 @@
 use Slim::Utils::Timers;
 
 use HTTP::Request;
-use JSON::XS qw(from_json);
+use JSON::XS::VersionOneAndTwo;
 use URI::Escape qw(uri_escape);
 
 my $log = Slim::Utils::Log->addLogCategory( {