diff --git a/Changelog b/Changelog
index b16c6a0bd557581c58cc3689b1c7f0ef74ba0700..30f7b7dc8702872f108670e1cab1ed3127e9c32d 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,9 @@
+Travel::Status::DE::DeutscheBahn 6.02 - Fri Apr 12 2024
+
+    * hafas-m: Add -j / --with-jid option
+    * $hafas->station: Correctly determine "name" and "eva" for stations that
+      have multiple EVA IDs and names.
+
 Travel::Status::DE::DeutscheBahn 6.01 - Thu Apr 04 2024
 
     * Journey: Add operators accessor
diff --git a/bin/hafas-m b/bin/hafas-m
index f88158972dc869bc1080a00ed4f9adb93bdf35f6..d2db11991f886129633b3ecd3df99ea104c098d4 100755
--- a/bin/hafas-m
+++ b/bin/hafas-m
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use 5.014;
 
-our $VERSION = '6.01';
+our $VERSION = '6.02';
 
 use utf8;
 use DateTime;
@@ -681,7 +681,7 @@ B<hafas-m> [B<-s> I<service>] [B<-l> I<language>] B<!>I<query>|I<journeyID>
 
 =head1 VERSION
 
-version 6.01
+version 6.02
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/DeutscheBahn.pm b/lib/Travel/Status/DE/DeutscheBahn.pm
index 2dffdd4800c60c93c6767536b94468d738c0632d..b6db00908eff99e8281e762cfe04dcb4ab9cf59d 100644
--- a/lib/Travel/Status/DE/DeutscheBahn.pm
+++ b/lib/Travel/Status/DE/DeutscheBahn.pm
@@ -6,7 +6,7 @@ use 5.014;
 
 use parent 'Travel::Status::DE::HAFAS';
 
-our $VERSION = '6.01';
+our $VERSION = '6.02';
 
 sub new {
 	my ( $class, %opt ) = @_;
@@ -49,7 +49,7 @@ monitor operated by Deutsche Bahn
 
 =head1 VERSION
 
-version 6.01
+version 6.02
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS.pm b/lib/Travel/Status/DE/HAFAS.pm
index 2cf642a443696cc115e21282d989fffe5bf38e78..13d2168d2029e21c07bf74f85ced4023434609c8 100644
--- a/lib/Travel/Status/DE/HAFAS.pm
+++ b/lib/Travel/Status/DE/HAFAS.pm
@@ -21,7 +21,7 @@ use Travel::Status::DE::HAFAS::Polyline qw(decode_polyline);
 use Travel::Status::DE::HAFAS::Product;
 use Travel::Status::DE::HAFAS::StopFinder;
 
-our $VERSION = '6.01';
+our $VERSION = '6.02';
 
 # {{{ Endpoint Definition
 
@@ -1225,7 +1225,7 @@ monitors
 
 =head1 VERSION
 
-version 6.01
+version 6.02
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS/Journey.pm b/lib/Travel/Status/DE/HAFAS/Journey.pm
index a31656ac9f38e9e2049eaad6603e33edf113b18c..978268ebc8be62f2051397b9c9efcf2c365fff66 100644
--- a/lib/Travel/Status/DE/HAFAS/Journey.pm
+++ b/lib/Travel/Status/DE/HAFAS/Journey.pm
@@ -11,7 +11,7 @@ use DateTime::Format::Strptime;
 use List::Util qw(any uniq);
 use Travel::Status::DE::HAFAS::Stop;
 
-our $VERSION = '6.01';
+our $VERSION = '6.02';
 
 Travel::Status::DE::HAFAS::Journey->mk_ro_accessors(
 	qw(datetime sched_datetime rt_datetime tz_offset
@@ -419,7 +419,7 @@ journey received by Travel::Status::DE::HAFAS
 
 =head1 VERSION
 
-version 6.01
+version 6.02
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS/Location.pm b/lib/Travel/Status/DE/HAFAS/Location.pm
index bac227aa68b3621bd221db323e72a202e977be4b..b58035faf060ab7ac063df1e3e84e5e3e9023282 100644
--- a/lib/Travel/Status/DE/HAFAS/Location.pm
+++ b/lib/Travel/Status/DE/HAFAS/Location.pm
@@ -6,7 +6,7 @@ use 5.014;
 
 use parent 'Class::Accessor';
 
-our $VERSION = '6.01';
+our $VERSION = '6.02';
 
 Travel::Status::DE::HAFAS::Location->mk_ro_accessors(
 	qw(lid type name eva state lat lon distance_m weight));
@@ -57,7 +57,7 @@ Travel::Status::DE::HAFAS::Location - A single public transit location
 
 =head1 VERSION
 
-version 6.01
+version 6.02
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS/Message.pm b/lib/Travel/Status/DE/HAFAS/Message.pm
index bb516b17cfe78ecb43cc0c3cdfc6f8ebc29dc12b..c6f361412b0c2b6245145f8559cf42fcf1b1118d 100644
--- a/lib/Travel/Status/DE/HAFAS/Message.pm
+++ b/lib/Travel/Status/DE/HAFAS/Message.pm
@@ -6,7 +6,7 @@ use 5.014;
 
 use parent 'Class::Accessor';
 
-our $VERSION = '6.01';
+our $VERSION = '6.02';
 
 Travel::Status::DE::HAFAS::Message->mk_ro_accessors(
 	qw(short type text code prio is_him ref_count));
@@ -69,7 +69,7 @@ Travel::Status::DE::HAFAS::Message - An arrival/departure-related message.
 
 =head1 VERSION
 
-version 6.01
+version 6.02
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS/Polyline.pm b/lib/Travel/Status/DE/HAFAS/Polyline.pm
index 06bee12bdd379cf9b4856ea49746d532bf233b28..2dee40d9584be715d318758d5e6478bf03c5bbcd 100644
--- a/lib/Travel/Status/DE/HAFAS/Polyline.pm
+++ b/lib/Travel/Status/DE/HAFAS/Polyline.pm
@@ -16,7 +16,7 @@ use 5.014;
 use parent 'Exporter';
 our @EXPORT_OK = qw(decode_polyline);
 
-our $VERSION = '6.01';
+our $VERSION = '6.02';
 
 # Translated this php script
 # <http://unitstep.net/blog/2008/08/02/decoding-google-maps-encoded-polylines-using-php/>
diff --git a/lib/Travel/Status/DE/HAFAS/Product.pm b/lib/Travel/Status/DE/HAFAS/Product.pm
index 4ee076a1cb81bdf83561dd2b39ffeb80717d4496..0517a02e42b8b012ab72ae7de00fedeaa3ebcfa2 100644
--- a/lib/Travel/Status/DE/HAFAS/Product.pm
+++ b/lib/Travel/Status/DE/HAFAS/Product.pm
@@ -8,7 +8,7 @@ use 5.014;
 
 use parent 'Class::Accessor';
 
-our $VERSION = '6.01';
+our $VERSION = '6.02';
 
 Travel::Status::DE::HAFAS::Product->mk_ro_accessors(
 	qw(class line_id line_no name number type type_long operator));
@@ -105,7 +105,7 @@ associated with a journey.
 
 =head1 VERSION
 
-version 6.01
+version 6.02
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS/Stop.pm b/lib/Travel/Status/DE/HAFAS/Stop.pm
index d078310d22e6936005de33a485a994b677aac701..afa6d41eaa61bc0bfc3335401aa33733d237fb2e 100644
--- a/lib/Travel/Status/DE/HAFAS/Stop.pm
+++ b/lib/Travel/Status/DE/HAFAS/Stop.pm
@@ -8,7 +8,7 @@ use 5.014;
 
 use parent 'Class::Accessor';
 
-our $VERSION = '6.01';
+our $VERSION = '6.02';
 
 Travel::Status::DE::HAFAS::Stop->mk_ro_accessors(
 	qw(loc
@@ -218,7 +218,7 @@ Travel::Status::DE::HAFAS::Stop - Information about a HAFAS stop.
 
 =head1 VERSION
 
-version 6.01
+version 6.02
 
 =head1 DESCRIPTION
 
diff --git a/lib/Travel/Status/DE/HAFAS/StopFinder.pm b/lib/Travel/Status/DE/HAFAS/StopFinder.pm
index c78f1b7ec8a3aa84f90b9573bcb4ce25c094c803..e54d5e6fe690d7f907e8f266a1a70cc0e9a60013 100644
--- a/lib/Travel/Status/DE/HAFAS/StopFinder.pm
+++ b/lib/Travel/Status/DE/HAFAS/StopFinder.pm
@@ -10,7 +10,7 @@ use Encode qw(decode);
 use JSON;
 use LWP::UserAgent;
 
-our $VERSION = '6.01';
+our $VERSION = '6.02';
 
 # {{{ Constructors
 
@@ -180,7 +180,7 @@ finder services
 
 =head1 VERSION
 
-version 6.01
+version 6.02
 
 =head1 DESCRIPTION