diff --git a/jsrl-get.pl b/jsrl-get.pl
index 0f0f723..af45060 100755
--- a/jsrl-get.pl
+++ b/jsrl-get.pl
@@ -26,7 +26,17 @@
 # Songs configuration
 my $songs_dir = "songs/";
 my $jsrl_url = "https://jetsetradio.live/radio/stations/";
-my @stations = ("classic", "future", "ggs", "poisonjam", "noisetanks", "loveshockers", "rapid99", "immortals", "doomriders", "goldenrhinos", "bumps", "summer", "christmas", "halloween", "ultraremixes", "kingforanotherday", "memoriesoftokyoto", "ollieking", "toejamandearl", "crazytaxi", "hover", "butterflies", "revolution", "endofdays", "lofi", "elaquent");
+
+# Fetch station titles
+my @stations = ();
+my $jsrl_url_homepage = "https://jetsetradio.live/";
+my $homepage = $lwp->get($jsrl_url_homepage);
+die "Error getting the homepage for '$jsrl_url_homepage'" if $homepage->is_error;
+for my $line_homepage (split /^/, $homepage->content) {
+  if ($line_homepage =~ /<script src="radio\/stations\/([^"]*)\/~list.js"><\/script>/) {
+    push @stations, $1;
+  }
+}
 
 if ($opts->{s}) {
   for my $station (@stations) {
@@ -34,9 +44,9 @@
     die "Error getting the list for '$jsrl_url$station/~list.js'" if $list->is_error;
 
     for my $line (split /^/, $list->content) {
-      if ($line =~ /"([^"]*)"/) {
+      if ($line =~ /] = "([^"]*)"/) {
         my $filename = $1.".mp3";
-        my $url = $jsrl_url.$station."/".$filename;
+        my $url = $jsrl_url.$station."/".URI::Escape::uri_escape_utf8($filename);
         my $path = $songs_dir.$station."/";
 
         download($url, $path, $filename);
@@ -71,7 +81,7 @@
   while (my ($channel_id, $videoarr) = each %tv) {
     foreach my $videofn (@$videoarr) {
       my $filename = $videofn.".mp4";
-      my $url = $jsrl_tv_url."ch".$channel_id."/".$filename;
+      my $url = $jsrl_tv_url."ch".$channel_id."/".URI::Escape::uri_escape_utf8($filename);
 
       download($url, $videos_dir."ch$channel_id/", $filename);
     }