diff --git a/Changelog b/Changelog
index 0d18b7e250beec7d43b26907cdcda3029facc473..cb154b727132b4035cbfda06e3a24e6552a21cbe 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+Travel::Routing::DE::VRR 2.22 - Fri Sep 01 2023
+
+    * Rewrite code not to use Perl's formerly experimental and now deprecated
+      smartmatch features
+
 Travel::Routing::DE::VRR 2.21 - Sat Jul 22 2023
 
     * Add service VRR3
diff --git a/bin/efa b/bin/efa
index 258fc11ac47530f909561d0aa575adfc3f999a66..01e96e293a30d8b6a573068d77acfdc01aae573e 100755
--- a/bin/efa
+++ b/bin/efa
@@ -12,7 +12,7 @@ use Exception::Class;
 use Getopt::Long qw/:config no_ignore_case/;
 use List::Util   qw(first);
 
-our $VERSION = '2.21';
+our $VERSION = '2.22';
 my $ignore_info;
 my $efa;
 my $efa_url = 'http://efa.vrr.de/vrr/XSLT_TRIP_REQUEST2';
@@ -481,7 +481,7 @@ efa - Command line client for EFA-based public transit routing services
 
 =head1 VERSION
 
-version 2.21
+version 2.22
 
 =head1 DESCRIPTION
 
@@ -798,7 +798,7 @@ to to request via -> to.
 
 =head1 AUTHOR
 
-Copyright (C) 2009-2021 by Birte Kristina Friesel E<lt>derf@finalrewind.orgE<gt>
+Copyright (C) 2009-2023 by Birte Kristina Friesel E<lt>derf@finalrewind.orgE<gt>
 
 =head1 LICENSE
 
diff --git a/lib/Travel/Routing/DE/EFA.pm b/lib/Travel/Routing/DE/EFA.pm
index 11daa124ca8bdab48a66fa8f04bcd49289455060..a23524b1066676c56228267a4b7c9dc6d7c335c3 100644
--- a/lib/Travel/Routing/DE/EFA.pm
+++ b/lib/Travel/Routing/DE/EFA.pm
@@ -40,7 +40,7 @@ use Exception::Class (
 	},
 );
 
-our $VERSION = '2.21';
+our $VERSION = '2.22';
 
 sub set_time {
 	my ( $self, %conf ) = @_;
@@ -981,7 +981,7 @@ Travel::Routing::DE::EFA - unofficial interface to EFA-based itinerary services
 
 =head1 VERSION
 
-version 2.21
+version 2.22
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Routing/DE/EFA/Route.pm b/lib/Travel/Routing/DE/EFA/Route.pm
index 856d16040170632c26ef8ae880f64a8f754e4aea..a802d678a67f6c9fa487bec23b6c77bf4097cffa 100644
--- a/lib/Travel/Routing/DE/EFA/Route.pm
+++ b/lib/Travel/Routing/DE/EFA/Route.pm
@@ -8,7 +8,7 @@ use parent 'Class::Accessor';
 
 use Travel::Routing::DE::EFA::Route::Part;
 
-our $VERSION = '2.21';
+our $VERSION = '2.22';
 
 Travel::Routing::DE::EFA::Route->mk_ro_accessors(
 	qw(duration ticket_text ticket_type fare_adult fare_child vehicle_time));
@@ -52,7 +52,7 @@ Travel::Routing::DE::EFA::Route - Single route (connection) between two points
 
 =head1 VERSION
 
-version 2.21
+version 2.22
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Routing/DE/EFA/Route/Message.pm b/lib/Travel/Routing/DE/EFA/Route/Message.pm
index e03fa26ec9fe1089f0017d3d3561dbd3030ce6f2..2412799d5ba204048a1f9ccb0965866c58eb9b05 100644
--- a/lib/Travel/Routing/DE/EFA/Route/Message.pm
+++ b/lib/Travel/Routing/DE/EFA/Route/Message.pm
@@ -6,7 +6,7 @@ use 5.010;
 
 use parent 'Class::Accessor';
 
-our $VERSION = '2.21';
+our $VERSION = '2.22';
 
 Travel::Routing::DE::EFA::Route::Message->mk_ro_accessors(
 	qw(is_detailed summary subject subtitle raw_content));
@@ -58,7 +58,7 @@ route or route part.
 
 =head1 VERSION
 
-version 2.21
+version 2.22
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Routing/DE/EFA/Route/Part.pm b/lib/Travel/Routing/DE/EFA/Route/Part.pm
index 5d6cb99b781eedfaaa5883b03d12cc09304f5ef1..d3db771b7f944bf1266637ca713066c96590286c 100644
--- a/lib/Travel/Routing/DE/EFA/Route/Part.pm
+++ b/lib/Travel/Routing/DE/EFA/Route/Part.pm
@@ -6,7 +6,7 @@ use 5.010;
 
 use parent 'Class::Accessor';
 
-our $VERSION = '2.21';
+our $VERSION = '2.22';
 
 my %occupancy = (
 	MANY_SEATS    => 1,
@@ -168,7 +168,7 @@ points, without interchanges
 
 =head1 VERSION
 
-version 2.21
+version 2.22
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Routing/DE/VRR.pm b/lib/Travel/Routing/DE/VRR.pm
index 1c2f7710a1b0f9ec49491ef00a00ad2879549609..998d86a2c6f36bd389636b1524bb69e2f65f5308 100644
--- a/lib/Travel/Routing/DE/VRR.pm
+++ b/lib/Travel/Routing/DE/VRR.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use 5.010;
 
-our $VERSION = '2.21';
+our $VERSION = '2.22';
 
 use parent 'Travel::Routing::DE::EFA';
 
@@ -47,7 +47,7 @@ Travel::Routing::DE::VRR - unofficial interface to the efa.vrr.de German itinera
 
 =head1 VERSION
 
-version 2.21
+version 2.22
 
 =head1 DESCRIPTION