diff --git a/assets/content-not-available-yet.json b/assets/content-not-available-yet.json
index c84a60c54..7ce499033 100644
--- a/assets/content-not-available-yet.json
+++ b/assets/content-not-available-yet.json
@@ -3,10 +3,5 @@
     "DE": "Kroatien",
     "EN": "Croatia",
     "FR": "Croatie"
-  },
-  {
-    "DE": "Nord-Mazedonien",
-    "EN": "North Macedonia",
-    "FR": "Macédoine du Nord"
   }
 ]
diff --git a/assets/images/flags/north-macedonia.webp b/assets/images/flags/north-macedonia.webp
new file mode 100644
index 000000000..b855bfb79
Binary files /dev/null and b/assets/images/flags/north-macedonia.webp differ
diff --git a/assets/images/logos/zrsm.svg b/assets/images/logos/zrsm.svg
index fcc030a14..ddfb8d6e6 100644
--- a/assets/images/logos/zrsm.svg
+++ b/assets/images/logos/zrsm.svg
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="120px" height="50px" viewBox="-0.5 -0.5 120 50"><defs/><g><rect x="0" y="0" width="120" height="50" rx="12.5" ry="12.5" fill="#255173" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 25px; margin-left: 1px;"><div data-drawio-colors="color: #ea891c; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 35px; font-family: Arial; color: rgb(234, 137, 28); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">ŽRSM</div></div></div></foreignObject><text x="60" y="36" fill="#ea891c" font-family="Arial" font-size="35px" text-anchor="middle" font-weight="bold">ŽRSM</text></switch></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="120px" height="50px" viewBox="-0.5 -0.5 120 50"><defs/><g><rect x="0" y="0" width="120" height="50" rx="12.5" ry="12.5" fill="#312a78" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 25px; margin-left: 1px;"><div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 35px; font-family: Arial; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">ŽRSM</div></div></div></foreignObject><text x="60" y="36" fill="#ffffff" font-family="Arial" font-size="35px" text-anchor="middle" font-weight="bold">ŽRSM</text></switch></g></g></svg>
diff --git a/content/application/cd/validity.yaml b/content/application/cd/validity.yaml
index b4d11e4b6..5ee87509f 100644
--- a/content/application/cd/validity.yaml
+++ b/content/application/cd/validity.yaml
@@ -366,7 +366,7 @@ operators:
       retired: coupon-1
       retired-relatives: coupon-1
       widows: coupon-1
-  zrms:
+  zrsm:
     fip-coupon:
       active: coupon-1
       active-relatives: coupon-1
diff --git a/content/application/db/validity.yaml b/content/application/db/validity.yaml
index f2cfb381c..878e012cf 100644
--- a/content/application/db/validity.yaml
+++ b/content/application/db/validity.yaml
@@ -466,7 +466,7 @@ operators:
       active-relatives: reduced-50
       retired: reduced-50
       retired-relatives: reduced-50
-  zrms:
+  zrsm:
     fip-coupon:
       active: coupon-4fields
       active-relatives: coupon-4fields
diff --git a/content/application/gb/validity.yaml b/content/application/gb/validity.yaml
index 68a06d2dc..ff633087a 100644
--- a/content/application/gb/validity.yaml
+++ b/content/application/gb/validity.yaml
@@ -503,7 +503,7 @@ operators:
       active-relatives: reduced-50
       retired: reduced-50
       retired-relatives: reduced-50
-  zrms:
+  zrsm:
     fip-coupon:
       active: coupon-active-1
       active-relatives: coupon-not-available
diff --git a/content/application/ns/validity.yaml b/content/application/ns/validity.yaml
index 0a3b4ab17..5534eb366 100644
--- a/content/application/ns/validity.yaml
+++ b/content/application/ns/validity.yaml
@@ -319,7 +319,7 @@ operators:
       active-relatives: coupon-1
       retired: coupon-1
       retired-relatives: coupon-1
-  zrms:
+  zrsm:
     fip-coupon:
       active: coupon-1
       active-relatives: coupon-1
diff --git a/content/application/sncb/validity.yaml b/content/application/sncb/validity.yaml
index be397a4f1..bc20d0fbe 100644
--- a/content/application/sncb/validity.yaml
+++ b/content/application/sncb/validity.yaml
@@ -433,7 +433,7 @@ operators:
       active-relatives: reduced-50
       retired: reduced-50
       retired-relatives: reduced-50
-  zrms:
+  zrsm:
     fip-coupon:
       active: coupon-1
       active-relatives: coupon-1
diff --git a/content/application/sncf/validity.yaml b/content/application/sncf/validity.yaml
index 76e3082d4..9b4edb8c2 100644
--- a/content/application/sncf/validity.yaml
+++ b/content/application/sncf/validity.yaml
@@ -328,7 +328,7 @@ operators:
       active-relatives: coupon-not-available
       retired: coupon-not-available
       retired-relatives: coupon-not-available
-  zrms:
+  zrsm:
     fip-coupon:
       active: coupon-4fields
       active-relatives: coupon-not-available
diff --git a/content/booking/zrsm-ticket-office/index.de.md b/content/booking/zrsm-ticket-office/index.de.md
new file mode 100644
index 000000000..6b7158eab
--- /dev/null
+++ b/content/booking/zrsm-ticket-office/index.de.md
@@ -0,0 +1,58 @@
+---
+title: "ŽRSM Ticketschalter"
+description: "Buchungsinformationen für die ŽRSM Ticketschalter."
+params:
+  classes:
+    second: "27 MKD"
+  fip_50: true
+  reservations: true
+  additional_info_link: "https://mzt.mk/%d0%bf%d1%80%d0%be%d0%b4%d0%b0%d0%b6%d0%b1%d0%b0-%d0%bd%d0%b0-%d0%b1%d0%b8%d0%bb%d0%b5%d1%82%d0%b8/"
+  type: "onsite"
+---
+
+Fahrkartenschalter der ŽRSM sind an den folgenden Bahnhöfen zu finden:
+
+- Skopje
+- Volkovo
+- Gjorche Petrov
+- Kumanovo
+- Veles
+- Negotino Vardar
+- Gevgelija
+- Bitola
+- Prilep
+- Shtip
+- Tetovo
+- Gostivar
+- Gradsko
+- Kichevo
+- Tabanovci
+  {.o-section--columns-3}
+
+Internationale Fahrkarten werden an internationalen Fahrkartenschaltern ausgestellt.
+
+Falls man kein Ticket hat, beträgt die Gebühr für den Zugang zum Warteraum oder zum Bahnsteig 26 MKD.[^1]
+
+{{% booking-section "fip_50" %}}
+
+## FIP 50 Fahrkarten
+
+Am ŽRSM Ticketschalter können FIP 50 Fahrkarten für Reisen für von der ŽRSM betriebenen Zügen erworben werden.
+
+Auf der ŽRSM Website ist eine [Preisübersicht für Normalpreise](https://mzt.mk/wp-content/uploads/2021/08/%D0%A6%D0%95%D0%9D%D0%90-%D0%9D%D0%90-%D0%92%D0%9E%D0%97%D0%95%D0%9D-%D0%91%D0%98%D0%9B%D0%95%D0%A2.pdf) veröfentlicht. Die entsprechende Relation ist anhand der Tabelle zu ermitteln, um den Fahrpreis (in Denar) zu bestimmen. Wir vermuten, dass der Preis für FIP ermäßigte Tickets bei 50% der Normalpreise liegt.
+
+{{% /booking-section %}}
+
+{{% booking-section "reservations" %}}
+
+## Reservierungen
+
+Am ŽRSM Ticketschalter können Sitzplatzreservierungen für eine Gebühr von 27 MKD pro Sitzplatz vorgenommen werden.[^1]
+
+Der reservierte Sitzplatz muss spätestens 15 Minuten nach Abfahrt des Zuges von dem Bahnhof, für den die Reservierung vorgenommen wurde, eingenommen werden. Wird der Sitzplatz nicht innerhalb dieser Zeit in Anspruch genommen, wird er für andere Fahrgäste freigegeben.[^2]
+
+{{% /booking-section %}}
+
+[^1]: [ŽRSM – Tarifbedingungen](https://mzt.mk/wp-content/uploads/2021/08/%D0%A1%D0%A2-05-%D0%BE%D0%B4-2020-4.pdf)
+
+[^2]: [ŽRSM – Reiseführer](https://mzt.mk/%d0%bf%d1%80%d0%b8%d1%80%d0%b0%d1%87%d0%bd%d0%b8%d0%ba-%d0%b7%d0%b0-%d0%bf%d0%b0%d1%82%d0%bd%d0%b8%d1%86%d0%b8/)
diff --git a/content/booking/zrsm-ticket-office/index.en.md b/content/booking/zrsm-ticket-office/index.en.md
new file mode 100644
index 000000000..0b5c47c92
--- /dev/null
+++ b/content/booking/zrsm-ticket-office/index.en.md
@@ -0,0 +1,58 @@
+---
+title: "ŽRSM Ticket Office"
+description: "Booking information for the ŽRSM ticket offices."
+params:
+  classes:
+    second: "27 MKD"
+  fip_50: true
+  reservations: true
+  additional_info_link: "https://mzt.mk/%d0%bf%d1%80%d0%be%d0%b4%d0%b0%d0%b6%d0%b1%d0%b0-%d0%bd%d0%b0-%d0%b1%d0%b8%d0%bb%d0%b5%d1%82%d0%b8/"
+  type: "onsite"
+---
+
+Ticket offices of ŽRSM can be found at the following stations:
+
+- Skopje
+- Volkovo
+- Gjorche Petrov
+- Kumanovo
+- Veles
+- Negotino Vardar
+- Gevgelija
+- Bitola
+- Prilep
+- Shtip
+- Tetovo
+- Gostivar
+- Gradsko
+- Kichevo
+- Tabanovci
+  {.o-section--columns-3}
+
+International tickets are issued at international ticket offices.
+
+If you do not have a ticket, the fee for access to the waiting room or platform is 26 MKD.[^1]
+
+{{% booking-section "fip_50" %}}
+
+## FIP 50 Tickets
+
+At the ŽRSM ticket office, FIP 50 tickets can be purchased for journeys on trains operated by ŽRSM.
+
+The ŽRSM website publishes a [price overview for standard fares](https://mzt.mk/wp-content/uploads/2021/08/%D0%A6%D0%95%D0%9D%D0%90-%D0%9D%D0%90-%D0%92%D0%9E%D0%97%D0%95%D0%9D-%D0%91%D0%98%D0%9D%D0%95%D0%A2.pdf). The relevant route can be identified using the table to determine the fare (in denars). We assume that the price for FIP-reduced tickets is 50% of the standard fares.
+
+{{% /booking-section %}}
+
+{{% booking-section "reservations" %}}
+
+## Reservations
+
+Seat reservations can be made at the ŽRSM ticket office for a fee of 27 MKD per seat.[^1]
+
+The reserved seat must be occupied no later than 15 minutes after the departure of the train from the station at which the reservation was made. If the seat is not claimed within this time, it is considered available to other passengers.[^2]
+
+{{% /booking-section %}}
+
+[^1]: [ŽRSM – Fare conditions](https://mzt.mk/wp-content/uploads/2021/08/%D0%A1%D0%A2-05-%D0%BE%D0%B4-2020-4.pdf)
+
+[^2]: [ŽRSM – Travel guide](https://mzt.mk/%d0%bf%d1%80%d0%b8%d1%80%d0%b0%d1%87%d0%bd%d0%b8%d0%ba-%d0%b7%d0%b0-%d0%bf%d0%b0%d1%82%d0%bd%d0%b8%d1%86%d0%b8/)
diff --git a/content/booking/zrsm-ticket-office/index.fr.md b/content/booking/zrsm-ticket-office/index.fr.md
new file mode 100644
index 000000000..dadf32cdd
--- /dev/null
+++ b/content/booking/zrsm-ticket-office/index.fr.md
@@ -0,0 +1,58 @@
+---
+title: "Guichet ŽRSM"
+description: "Informations de réservation pour les guichets ŽRSM."
+params:
+  classes:
+    second: "27 MKD"
+  fip_50: true
+  reservations: true
+  additional_info_link: "https://mzt.mk/%d0%bf%d1%80%d0%be%d0%b4%d0%b0%d0%b6%d0%b1%d0%b0-%d0%bd%d0%b0-%d0%b1%d0%b8%d0%bb%d0%b5%d1%82%d0%b8/"
+  type: "onsite"
+---
+
+Les guichets de vente des billets de la ŽRSM se trouvent dans les gares suivantes :
+
+- Skopje
+- Volkovo
+- Gjorche Petrov
+- Kumanovo
+- Veles
+- Negotino Vardar
+- Gevgelija
+- Bitola
+- Prilep
+- Shtip
+- Tetovo
+- Gostivar
+- Gradsko
+- Kichevo
+- Tabanovci
+  {.o-section--columns-3}
+
+Les billets internationaux sont délivrés dans les guichets de billets internationaux.
+
+Si vous n’avez pas de billet, le droit d’accès à la salle d’attente ou au quai est de 26 MKD.[^1]
+
+{{% booking-section "fip_50" %}}
+
+## Billets FIP 50
+
+Au guichet ŽRSM, les billets FIP 50 peuvent être achetés pour des voyages effectués sur les trains exploités par la ŽRSM.
+
+Le site web de la ŽRSM publie une [aperçu des prix pour les tarifs normaux](https://mzt.mk/wp-content/uploads/2021/08/%D0%A6%D0%95%D0%9D%D0%90-%D0%9D%D0%90-%D0%92%D0%9E%D0%97%D0%95%D0%9D-%D0%91%D0%98%D0%9B%D0%95%D0%A2.pdf). La relation concernée peut être déterminée à l’aide du tableau afin de calculer le prix du billet (en denars). Nous supposons que le prix des billets réduits FIP correspond à 50 % des tarifs normaux.
+
+{{% /booking-section %}}
+
+{{% booking-section "reservations" %}}
+
+## Réservations
+
+Les réservations de places assises peuvent être effectuées au guichet de la ŽRSM moyennant des frais de 27 MKD par place.[^1]
+
+La place réservée doit être occupée au plus tard 15 minutes après le départ du train de la gare pour laquelle la réservation a été effectuée. Si la place n'est pas occupée dans ce délai, elle est mise à la disposition d'autres voyageurs.[^2]
+
+{{% /booking-section %}}
+
+[^1]: [ŽRSM – Conditions tarifaires](https://mzt.mk/wp-content/uploads/2021/08/%D0%A1%D0%A2-05-%D0%BE%D0%B4-2020-4.pdf)
+
+[^2]: [ŽRSM – Guide du voyageur](https://mzt.mk/%d0%bf%d1%80%d0%b8%d1%80%d0%b0%d1%87%d0%bd%d0%b8%d0%ba-%d0%b7%d0%b0-%d0%bf%d0%b0%d1%82%d0%bd%d0%b8%d1%86%d0%b8/)
diff --git a/content/country/greece/index.de.md b/content/country/greece/index.de.md
index c358e3ef8..7f7b93bbf 100644
--- a/content/country/greece/index.de.md
+++ b/content/country/greece/index.de.md
@@ -31,12 +31,12 @@ Die Qualität der Züge variiert: Während moderne elektrische Triebzüge auf de
 
 {{% expander "Grenzpunkte" border %}}
 
-| Land                                                   | Grenzpunkte                     |
-| ------------------------------------------------------ | ------------------------------- |
-| Nordmazedonien (ŽRSM)                                  | Gevgelija (fr)                  |
-| [Bulgarien](/country/bulgaria) ([BDŽ](/operator/bdz))  | Kulata (fr), Svilengrad (fr)    |
-| Türkei (TCDD)                                          | Pythio (Πύθιο)                  |
-| [Italien](/country/italy) ([Attica](/operator/attica)) | Patras (Πάτρα) [>Ancona, >Bari] |
+| Land                                                                | Grenzpunkte                             |
+| ------------------------------------------------------------------- | --------------------------------------- |
+| [Nordmazedonien](/country/north-macedonia) ([ŽRSM](/operator/zrsm)) | Gevgelija (fr) (Mazedonisch: Гевгелија) |
+| [Bulgarien](/country/bulgaria) ([BDŽ](/operator/bdz))               | Kulata (fr), Svilengrad (fr)            |
+| Türkei (TCDD)                                                       | Pythio (Πύθιο)                          |
+| [Italien](/country/italy) ([Attica](/operator/attica))              | Patras (Πάτρα) [>Ancona, >Bari]         |
 
 [>] = In Richtung (z. B. Patras [> Ancona] = Patras ist der Grenzpunkt in Richtung Ancona)
 
diff --git a/content/country/greece/index.en.md b/content/country/greece/index.en.md
index efe12ba55..3ef69c498 100644
--- a/content/country/greece/index.en.md
+++ b/content/country/greece/index.en.md
@@ -31,12 +31,12 @@ The quality of trains varies: while modern electric multiple units operate on th
 
 {{% expander "Border Points" border %}}
 
-| Country                                              | Border Points                   |
-| ---------------------------------------------------- | ------------------------------- |
-| North Macedonia (ŽRSM)                               | Gevgelija (fr)                  |
-| [Bulgaria](/country/bulgaria) ([BDŽ](/operator/bdz)) | Kulata (fr), Svilengrad (fr)    |
-| Turkey (TCDD)                                        | Pythio (Πύθιο)                  |
-| [Italy](/country/italy) ([Attica](/operator/attica)) | Patras (Πάτρα) [>Ancona, >Bari] |
+| Country                                                              | Border Points                          |
+| -------------------------------------------------------------------- | -------------------------------------- |
+| [North Macedonia](/country/north-macedonia) ([ŽRSM](/operator/zrsm)) | Gevgelija (fr) (Macedonian: Гевгелија) |
+| [Bulgaria](/country/bulgaria) ([BDŽ](/operator/bdz))                 | Kulata (fr), Svilengrad (fr)           |
+| Turkey (TCDD)                                                        | Pythio (Πύθιο)                         |
+| [Italy](/country/italy) ([Attica](/operator/attica))                 | Patras (Πάτρα) [>Ancona, >Bari]        |
 
 [>] = In the direction of (e.g. Patras [> Ancona] = Patras is the border point in the direction of Ancona)
 
diff --git a/content/country/greece/index.fr.md b/content/country/greece/index.fr.md
index d8ad279ad..81675cd44 100644
--- a/content/country/greece/index.fr.md
+++ b/content/country/greece/index.fr.md
@@ -31,12 +31,12 @@ La qualité des trains varie : si des rames électriques modernes circulent sur
 
 {{% expander "Points frontières" border %}}
 
-| Pays                                                  | Points frontières               |
-| ----------------------------------------------------- | ------------------------------- |
-| Macédoine du Nord (ŽRSM)                              | Gevgelija (fr)                  |
-| [Bulgarie](/country/bulgaria) ([BDŽ](/operator/bdz))  | Kulata (fr), Svilengrad (fr)    |
-| Turquie (TCDD)                                        | Pythio (Πύθιο)                  |
-| [Italie](/country/italy) ([Attica](/operator/attica)) | Patras (Πάτρα) [>Ancona, >Bari] |
+| Pays                                                                   | Points frontières                       |
+| ---------------------------------------------------------------------- | --------------------------------------- |
+| [Macédoine du Nord](/country/north-macedonia) ([ŽRSM](/operator/zrsm)) | Gevgelija (fr) (Macédonien : Гевгелија) |
+| [Bulgarie](/country/bulgaria) ([BDŽ](/operator/bdz))                   | Kulata (fr), Svilengrad (fr)            |
+| Turquie (TCDD)                                                         | Pythio (Πύθιο)                          |
+| [Italie](/country/italy) ([Attica](/operator/attica))                  | Patras (Πάτρα) [>Ancona, >Bari]         |
 
 [>] = En direction de (par ex. Patras [> Ancona] = Patras est le point frontière en direction d’Ancona)
 
diff --git a/content/country/north-macedonia/image.webp b/content/country/north-macedonia/image.webp
new file mode 100644
index 000000000..1ad81d155
Binary files /dev/null and b/content/country/north-macedonia/image.webp differ
diff --git a/content/country/north-macedonia/index.de.md b/content/country/north-macedonia/index.de.md
new file mode 100644
index 000000000..96488fcfb
--- /dev/null
+++ b/content/country/north-macedonia/index.de.md
@@ -0,0 +1,40 @@
+---
+title: "Nordmazedonien"
+country: "north-macedonia"
+---
+
+## FIP Nutzung
+
+In Nordmazedonien wird der Schienenverkehr von der staatlichen Eisenbahngesellschaft Železnici na Republika Severna Makedonija (ŽRSM) betrieben.
+
+{{< identify-operator sources="zrsm-website" >}}
+{{< /identify-operator >}}
+
+## Wissenswertes
+
+Nordmazedonien hat ein Streckennetz von 925 Kilometern in Normalspur, welches mit einer Höchstgeschwindigkeit von 100 km/h befahren werden kann. Lediglich auf der Strecke Tabanovci – Gevgelija gibt es ein automatisches Zugsicherungssystem. Früher gab es zusätzlich Schmalspurbahnen, welche allerdings alle nicht mehr in Benutzung sind. Derzeit gibt es keinen internationalen Personenverkehr auf der Schiene, allerdings gibt es Neu- und Ausbauprojekte. Der Bahnverkehr hat einen recht geringen Stellenwert im Land. [^1]
+
+Es gibt keinen Taktverkehr, sondern nur einzelne Züge, welche in größeren zeitlichen Abständen zueinander verkehren. Viele Verbindungen starten bzw. enden in Skopje. Als verkehrstechnisch bedeutsamste Strecke gilt die Nord-Süd-Route durch Skopje, jedoch bietet diese keine ausgeprägten touristischen Besonderheiten. Der Schienenverkehr hat insgesamt einen geringen Stellenwert im Land – das Bussystem dominiert den öffentlichen Nahverkehr.
+
+## Anreise und Grenzpunkte
+
+{{% expander "Grenzpunkte" border %}}
+
+| Land                                                             | Grenzpunkte                                              |
+| ---------------------------------------------------------------- | -------------------------------------------------------- |
+| [Serbien](/country/serbia) ([SV](/operator/sv))                  | Tabanovci (fr) (Serbisch: Табановце; Albanisch: Tabanoc) |
+| [Griechenland](/country/greece) ([Hellenic Train](/operator/ht)) | Gevgelija (fr) (Mazedonisch: Гевгелија)                  |
+
+{{% /expander %}}
+
+### Serbien
+
+Zurzeit verkehren keine Personenzüge zwischen Nordmazedonien und Serbien.
+
+### Griechenland
+
+Zwischen Nordmazedonien und Griechenland gibt es keinen planmäßigen Personenverkehr auf der Schiene. Die historische Verbindung zwischen Thessaloniki und Gevgelija/Skopje wird gegenwärtig nicht betrieben. Grenzübergänge können daher nicht per Zug überquert werden; alternativ bieten sich Fernbusse über die Balkanrouten an.
+
+## Quellen
+
+[^1]: [Wikipedia](https://de.wikipedia.org/wiki/Schienenverkehr_in_Nordmazedonien#Streckennetz)
diff --git a/content/country/north-macedonia/index.en.md b/content/country/north-macedonia/index.en.md
new file mode 100644
index 000000000..64847aa71
--- /dev/null
+++ b/content/country/north-macedonia/index.en.md
@@ -0,0 +1,40 @@
+---
+title: "North Macedonia"
+country: "north-macedonia"
+---
+
+## FIP Information
+
+In North Macedonia, rail transport is operated by the state railway company Železnici na Republika Severna Makedonija (ŽRSM).
+
+{{< identify-operator sources="zrsm-website" >}}
+{{< /identify-operator >}}
+
+## Interesting
+
+North Macedonia has a 925-kilometre standard-gauge rail network, which can be used at a maximum speed of 100 km/h. Only the Tabanovci – Gevgelija line has an automatic train protection system. In the past, there were also narrow-gauge railways, but none are in use anymore. There is currently no international passenger rail traffic, although there are new construction and expansion projects. Rail transport has a relatively low priority in the country. [^1]
+
+There is no regular timetable, but only individual trains operating at longer intervals. Many connections start or end in Skopje. The most important route from a transport perspective is the north-south line through Skopje, although it does not offer particularly notable tourist features. Rail transport as a whole has a low priority in the country — the bus system dominates local public transport.
+
+## Arrival and Border Points
+
+{{% expander "Border Points" border %}}
+
+| Country                                                    | Border Points                                          |
+| ---------------------------------------------------------- | ------------------------------------------------------ |
+| [Serbia](/country/serbia) ([SV](/operator/sv))             | Tabanovci (fr) (Serbian: Табановце; Albanian: Tabanoc) |
+| [Greece](/country/greece) ([Hellenic Train](/operator/ht)) | Gevgelija (fr) (Macedonian: Гевгелија)                 |
+
+{{% /expander %}}
+
+### Serbia
+
+Currently, there are no passenger trains between North Macedonia and Serbia.
+
+### Greece
+
+There is no scheduled passenger rail service between North Macedonia and Greece. The historic connection between Thessaloniki and Gevgelija/Skopje is currently not in operation. Border crossings therefore cannot be crossed by train; alternative options include long-distance buses via the Balkan routes.
+
+## Sources
+
+[^1]: [Wikipedia](https://en.wikipedia.org/wiki/Rail_transport_in_North_Macedonia#Network)
diff --git a/content/country/north-macedonia/index.fr.md b/content/country/north-macedonia/index.fr.md
new file mode 100644
index 000000000..a8411c009
--- /dev/null
+++ b/content/country/north-macedonia/index.fr.md
@@ -0,0 +1,40 @@
+---
+title: "Macédoine du Nord"
+country: "north-macedonia"
+---
+
+## Informations FIP
+
+En Macédoine du Nord, le transport ferroviaire est assuré par la compagnie ferroviaire nationale Železnici na Republika Severna Makedonija (ŽRSM).
+
+{{< identify-operator sources="zrsm-website" >}}
+{{< /identify-operator >}}
+
+## Informations générales
+
+La Macédoine du Nord dispose d’un réseau ferroviaire de 925 kilomètres à voie normale, exploitable à une vitesse maximale de 100 km/h. Seule la ligne Tabanovci – Gevgelija est équipée d’un système automatique de sécurité des trains. Il existait autrefois des lignes à voie étroite, mais elles ne sont plus utilisées. Il n’y a actuellement aucun trafic ferroviaire international de voyageurs, bien que des projets de construction et d’extension soient en cours. Le transport ferroviaire a une importance relativement faible dans le pays. [^1]
+
+Il n’existe pas d’horaires réguliers, mais seulement des trains individuels circulant à des intervalles plus longs. De nombreuses liaisons commencent ou se terminent à Skopje. La ligne la plus importante du point de vue du transport est la route nord-sud traversant Skopje, bien qu’elle ne présente pas de particularités touristiques marquées. Le transport ferroviaire a dans l’ensemble une faible importance dans le pays ; le système de bus domine les transports publics locaux.
+
+## Arrivée et points frontières
+
+{{% expander "Points frontières" border %}}
+
+| Pays                                                      | Points frontières                                       |
+| --------------------------------------------------------- | ------------------------------------------------------- |
+| [Serbie](/country/serbia) ([SV](/operator/sv))            | Tabanovci (fr) (Serbe : Табановце ; albanais : Tabanoc) |
+| [Grèce](/country/greece) ([Hellenic Train](/operator/ht)) | Gevgelija (fr) (Macédonien : Гевгелија)                 |
+
+{{% /expander %}}
+
+### Serbie
+
+À l’heure actuelle, aucun train de voyageurs ne circule entre la Macédoine du Nord et la Serbie.
+
+### Grèce
+
+Il n’existe pas de service ferroviaire voyageurs régulier entre la Macédoine du Nord et la Grèce. La liaison historique entre Thessalonique et Gevgelija/Skopje n’est actuellement pas exploitée. Les points de passage frontaliers ne peuvent donc pas être traversés en train ; des bus longue distance via les routes des Balkans constituent une alternative.
+
+## Sources
+
+[^1]: [Wikipedia](https://fr.wikipedia.org/wiki/Transport_ferroviaire_en_Mac%C3%A9doine_du_Nord)
diff --git a/content/country/serbia/index.de.md b/content/country/serbia/index.de.md
index b84a14665..06bfef9e0 100644
--- a/content/country/serbia/index.de.md
+++ b/content/country/serbia/index.de.md
@@ -33,7 +33,7 @@ Die Züge in Serbien sind abseits der Hauptstrecken meist eher älter und wenige
 | [Ungarn](/country/hungary) ([MÁV](/operator/mav))                                                          | Röszke (Gr), Subotica (Gr)                               |
 | [Rumänien](/country/romania) ([CFR](/operator/cfr))                                                        | Jimbolia (fr), Vršac (fr)                                |
 | [Bulgarien](/country/bulgaria) ([BDZ](/operator/bdz))                                                      | Dimitrovgrad (fr)                                        |
-| Nordmazedonien (ŽRSM)                                                                                      | Tabanovci (fr) (Serbisch: Табановце; Albanisch: Tabanoc) |
+| [Nordmazedonien](/country/north-macedonia) ([ŽRSM](/operator/zrsm))                                        | Tabanovci (fr) (Serbisch: Табановце; Albanisch: Tabanoc) |
 | [Montenegro](/country/montenegro) ([ŽPCG](/operator/zpcg))                                                 | Bijelo Polje (Gr)                                        |
 | [Bosnien und Herzegowina](/country/bosnia-and-herzegovina) ([ŽFBH](/operator/zfbh) / [ŽRS](/operator/zrs)) | Zvornik                                                  |
 | Kroatien (HŽ)                                                                                              | Erdut (Gr) (Serbisch: Ердут), Šid (Gr) (Serbisch: Шид)   |
diff --git a/content/country/serbia/index.en.md b/content/country/serbia/index.en.md
index 0aae39a93..ad33c5550 100644
--- a/content/country/serbia/index.en.md
+++ b/content/country/serbia/index.en.md
@@ -33,7 +33,7 @@ The trains in Serbia are mostly older and less modern, away from the main routes
 | [Hungary](/country/hungary) ([MÁV](/operator/mav))                                                        | Röszke (Gr), Subotica (Gr)                             |
 | [Romania](/country/romania) ([CFR](/operator/cfr))                                                        | Jimbolia (fr), Vršac (fr)                              |
 | [Bulgaria](/country/bulgaria) ([BDZ](/operator/bdz))                                                      | Dimitrovgrad (fr)                                      |
-| North Macedonia (ŽRSM)                                                                                    | Tabanovci (fr) (Serbian: Табановце; Albanian: Tabanoc) |
+| [North Macedonia](/country/north-macedonia) ([ŽRSM](/operator/zrsm))                                      | Tabanovci (fr) (Serbian: Табановце; Albanian: Tabanoc) |
 | [Montenegro](/country/montenegro) ([ŽPCG](/operator/zpcg))                                                | Bijelo Polje (Gr)                                      |
 | [Bosnia and Herzegovina](/country/bosnia-and-herzegovina) ([ŽFBH](/operator/zfbh) / [ŽRS](/operator/zrs)) | Zvornik                                                |
 | Croatia (HŽ)                                                                                              | Erdut (Gr) (Serbian: Ердут), Šid (Gr) (Serbian: Шид)   |
diff --git a/content/country/serbia/index.fr.md b/content/country/serbia/index.fr.md
index 3e590d658..a24a47bf8 100644
--- a/content/country/serbia/index.fr.md
+++ b/content/country/serbia/index.fr.md
@@ -33,7 +33,7 @@ Les trains en Serbie sont majoritairement plus anciens et moins modernes, à l
 | [Hongrie](/country/hungary) ([MÁV](/operator/mav))                                                    | Röszke (Gr), Subotica (Gr)                              |
 | [Roumanie](/country/romania) ([CFR](/operator/cfr))                                                   | Jimbolia (fr), Vršac (fr)                               |
 | [Bulgarie](/country/bulgaria) ([BDZ](/operator/bdz))                                                  | Dimitrovgrad (fr)                                       |
-| Macédoine du Nord (ŽRSM)                                                                              | Tabanovci (fr) (serbe : Табановце ; albanais : Tabanoc) |
+| [Macédoine du Nord](/country/north-macedonia) ([ŽRSM](/operator/zrsm))                                | Tabanovci (fr) (serbe : Табановце ; albanais : Tabanoc) |
 | [Monténégro](/country/montenegro) ([ŽPCG](/operator/zpcg))                                            | Bijelo Polje (Gr)                                       |
 | [Bosnie-Herzégovine](/country/bosnia-and-herzegovina) ([ŽFBH](/operator/zfbh) / [ŽRS](/operator/zrs)) | Zvornik                                                 |
 | Croatie (HŽ)                                                                                          | Erdut (Gr) (serbe : Ердут), Šid (Gr) (serbe : Шид)      |
diff --git a/content/identify-operator/zrsm-website/index.de.md b/content/identify-operator/zrsm-website/index.de.md
new file mode 100644
index 000000000..8449f318f
--- /dev/null
+++ b/content/identify-operator/zrsm-website/index.de.md
@@ -0,0 +1,7 @@
+---
+title: ŽRSM Website
+params:
+  url: https://mzt.mk/
+---
+
+Auf der Website der ŽRSM sind alle Züge aufgeführt. Im Menüpunkt Возен Ред (dt. Fahrplan) sind die Züge mit Abfahrt von Skopje und Ankunft in Skopje (d. h. die Züge in Gegenrichtung) aufgelistet.
diff --git a/content/identify-operator/zrsm-website/index.en.md b/content/identify-operator/zrsm-website/index.en.md
new file mode 100644
index 000000000..766d98842
--- /dev/null
+++ b/content/identify-operator/zrsm-website/index.en.md
@@ -0,0 +1,7 @@
+---
+title: ŽRSM Website
+params:
+  url: https://mzt.mk/
+---
+
+All trains are listed on the ŽRSM website. Under the Возен Ред (Timetable) section, you can find the list of trains departing from and arriving in Skopje (i.e., trains running in the opposite direction).
diff --git a/content/identify-operator/zrsm-website/index.fr.md b/content/identify-operator/zrsm-website/index.fr.md
new file mode 100644
index 000000000..5ec97111d
--- /dev/null
+++ b/content/identify-operator/zrsm-website/index.fr.md
@@ -0,0 +1,7 @@
+---
+title: Site Web ŽRSM
+params:
+  url: https://mzt.mk/
+---
+
+Tous les trains sont répertoriés sur le site web de la ŽRSM. Sous la rubrique « Возен Ред » (Horaires), vous trouverez la liste des trains au départ et à destination de Skopje (c’est-à-dire les trains circulant dans l’autre sens).
diff --git a/content/operator/attica/index.de.md b/content/operator/attica/index.de.md
index fa812c3b0..aaac6cb8c 100644
--- a/content/operator/attica/index.de.md
+++ b/content/operator/attica/index.de.md
@@ -125,7 +125,7 @@ Für Reisende durch mehrere Balkanländer kann sich der _Balkan Flexipass_ preis
 
 - Bosnien und Herzegowina (ŽFBH, ŽRS),
 - Bulgarien (BDŽ),
-- Nordmazedonien (MŽ-Transport),
+- Nordmazedonien (ŽRSM),
 - Griechenland (HT & Attica),
 - Montenegro (ŽPCG),
 - Rumänien (CFR Calatori & Regiotrans),
diff --git a/content/operator/attica/index.en.md b/content/operator/attica/index.en.md
index f423e8506..3bcc8ce77 100644
--- a/content/operator/attica/index.en.md
+++ b/content/operator/attica/index.en.md
@@ -127,7 +127,7 @@ For travellers through several Balkan countries, the Balkan Flexipass could be w
 
 - Bosnia and Herzegovina (ZFBH),
 - Bulgaria (BDZ),
-- North Macedonia (MŽ-Transport),
+- North Macedonia (ŽRSM),
 - Greece (HT & Attica),
 - Montenegro (ŽPCG),
 - Romania (CFR Calatori & Regiotrans),
diff --git a/content/operator/attica/index.fr.md b/content/operator/attica/index.fr.md
index 1f4064552..b2ba3e513 100644
--- a/content/operator/attica/index.fr.md
+++ b/content/operator/attica/index.fr.md
@@ -127,7 +127,7 @@ Pour les voyageurs traversant plusieurs pays des Balkans, le Balkan Flexipass pe
 
 - Bosnie-Herzégovine (ZFBH),
 - Bulgarie (BDZ),
-- Macédoine du Nord (MŽ-Transport),
+- Macédoine du Nord (ŽRSM),
 - Grèce (HT & Attica),
 - Monténégro (ŽPCG),
 - Roumanie (CFR Calatori & Regiotrans),
diff --git a/content/operator/bdz/index.de.md b/content/operator/bdz/index.de.md
index 1ccded4b1..9f9ba6691 100644
--- a/content/operator/bdz/index.de.md
+++ b/content/operator/bdz/index.de.md
@@ -138,7 +138,7 @@ Für Reisende durch mehrere Balkanländer kann sich der _Balkan Flexipass_ preis
 
 - Bosnien und Herzegowina (ŽFBH, ŽRS),
 - Bulgarien (BDŽ),
-- Nordmazedonien (MŽ-Transport),
+- Nordmazedonien (ŽRSM),
 - Griechenland (HT & Attica),
 - Montenegro (ŽPCG),
 - Rumänien (CFR Calatori & Regiotrans),
diff --git a/content/operator/bdz/index.en.md b/content/operator/bdz/index.en.md
index 96b820d18..3d984ff59 100644
--- a/content/operator/bdz/index.en.md
+++ b/content/operator/bdz/index.en.md
@@ -140,7 +140,7 @@ For travellers through several Balkan countries, the Balkan Flexipass could be w
 
 - Bosnia and Herzegovina (ZFBH),
 - Bulgaria (BDZ),
-- North Macedonia (MŽ-Transport),
+- North Macedonia (ŽRSM),
 - Greece (HT & Attica),
 - Montenegro (ŽPCG),
 - Romania (CFR Calatori & Regiotrans),
diff --git a/content/operator/bdz/index.fr.md b/content/operator/bdz/index.fr.md
index c5a5edc23..954d4540f 100644
--- a/content/operator/bdz/index.fr.md
+++ b/content/operator/bdz/index.fr.md
@@ -140,7 +140,7 @@ Pour les voyageurs traversant plusieurs pays des Balkans, le Balkan Flexipass pe
 
 - Bosnie-Herzégovine (ZFBH),
 - Bulgarie (BDZ),
-- Macédoine du Nord (MŽ-Transport),
+- Macédoine du Nord (ŽRSM),
 - Grèce (HT & Attica),
 - Monténégro (ŽPCG),
 - Roumanie (CFR Calatori & Regiotrans),
diff --git a/content/operator/cfr/index.de.md b/content/operator/cfr/index.de.md
index 9172829c0..8604fff96 100644
--- a/content/operator/cfr/index.de.md
+++ b/content/operator/cfr/index.de.md
@@ -193,7 +193,7 @@ Für Reisende durch mehrere Balkanländer kann sich der _Balkan Flexipass_ preis
 
 - Bosnien und Herzegowina (ŽFBH, ŽRS),
 - Bulgarien (BDŽ),
-- Nordmazedonien (MŽ-Transport),
+- Nordmazedonien (ŽRSM),
 - Griechenland (HT & Attica),
 - Montenegro (ŽPCG),
 - Rumänien (CFR Calatori & Regiotrans),
diff --git a/content/operator/cfr/index.en.md b/content/operator/cfr/index.en.md
index 16545d71a..5e55e49ca 100644
--- a/content/operator/cfr/index.en.md
+++ b/content/operator/cfr/index.en.md
@@ -195,7 +195,7 @@ For travellers through several Balkan countries, the Balkan Flexipass could be w
 
 - Bosnia and Herzegovina (ZFBH),
 - Bulgaria (BDZ),
-- North Macedonia (MŽ-Transport),
+- North Macedonia (ŽRSM),
 - Greece (HT & Attica),
 - Montenegro (ŽPCG),
 - Romania (CFR Calatori & Regiotrans),
diff --git a/content/operator/cfr/index.fr.md b/content/operator/cfr/index.fr.md
index 8967abfe2..0d51025c3 100644
--- a/content/operator/cfr/index.fr.md
+++ b/content/operator/cfr/index.fr.md
@@ -195,7 +195,7 @@ Pour les voyageurs traversant plusieurs pays des Balkans, le Balkan Flexipass pe
 
 - Bosnie-Herzégovine (ZFBH),
 - Bulgarie (BDZ),
-- Macédoine du Nord (MŽ-Transport),
+- Macédoine du Nord (ŽRSM),
 - Grèce (HT & Attica),
 - Monténégro (ŽPCG),
 - Roumanie (CFR Calatori & Regiotrans),
diff --git a/content/operator/ht/index.de.md b/content/operator/ht/index.de.md
index ad780f2b7..5d096e42d 100644
--- a/content/operator/ht/index.de.md
+++ b/content/operator/ht/index.de.md
@@ -143,7 +143,7 @@ Für Reisende durch mehrere Balkanländer kann sich der _Balkan Flexipass_ preis
 
 - Bosnien und Herzegowina (ŽFBH, ŽRS),
 - Bulgarien (BDŽ),
-- Nordmazedonien (MŽ-Transport),
+- Nordmazedonien (ŽRSM),
 - Griechenland (HT & Attica),
 - Montenegro (ŽPCG),
 - Rumänien (CFR Calatori & Regiotrans),
diff --git a/content/operator/ht/index.en.md b/content/operator/ht/index.en.md
index 9479ae01e..a71babc5c 100644
--- a/content/operator/ht/index.en.md
+++ b/content/operator/ht/index.en.md
@@ -145,7 +145,7 @@ For travellers through several Balkan countries, the Balkan Flexipass could be w
 
 - Bosnia and Herzegovina (ZFBH),
 - Bulgaria (BDZ),
-- North Macedonia (MŽ-Transport),
+- North Macedonia (ŽRSM),
 - Greece (HT & Attica),
 - Montenegro (ŽPCG),
 - Romania (CFR Calatori & Regiotrans),
diff --git a/content/operator/ht/index.fr.md b/content/operator/ht/index.fr.md
index a32262eb5..ec6a3f1ff 100644
--- a/content/operator/ht/index.fr.md
+++ b/content/operator/ht/index.fr.md
@@ -145,7 +145,7 @@ Pour les voyageurs traversant plusieurs pays des Balkans, le Balkan Flexipass pe
 
 - Bosnie-Herzégovine (ZFBH),
 - Bulgarie (BDZ),
-- Macédoine du Nord (MŽ-Transport),
+- Macédoine du Nord (ŽRSM),
 - Grèce (HT & Attica),
 - Monténégro (ŽPCG),
 - Roumanie (CFR Calatori & Regiotrans),
diff --git a/content/operator/sv/index.de.md b/content/operator/sv/index.de.md
index 085b4eb13..1cdce05fe 100644
--- a/content/operator/sv/index.de.md
+++ b/content/operator/sv/index.de.md
@@ -176,7 +176,7 @@ Für Reisende durch mehrere Balkanländer kann sich der _Balkan Flexipass_ preis
 
 - Bosnien und Herzegowina (ŽFBH, ŽRS),
 - Bulgarien (BDŽ),
-- Nordmazedonien (MŽ-Transport),
+- Nordmazedonien (ŽRSM),
 - Griechenland (HT & Attica),
 - Montenegro (ŽPCG),
 - Rumänien (CFR Calatori & Regiotrans),
diff --git a/content/operator/sv/index.en.md b/content/operator/sv/index.en.md
index 93a2d8eb7..bd044e70c 100644
--- a/content/operator/sv/index.en.md
+++ b/content/operator/sv/index.en.md
@@ -178,7 +178,7 @@ For travellers through several Balkan countries, the Balkan Flexipass could be w
 
 - Bosnia and Herzegovina (ZFBH),
 - Bulgaria (BDZ),
-- North Macedonia (MŽ-Transport),
+- North Macedonia (ŽRSM),
 - Greece (HT & Attica),
 - Montenegro (ŽPCG),
 - Romania (CFR Calatori & Regiotrans),
diff --git a/content/operator/sv/index.fr.md b/content/operator/sv/index.fr.md
index a3d10228d..88a13e37d 100644
--- a/content/operator/sv/index.fr.md
+++ b/content/operator/sv/index.fr.md
@@ -178,7 +178,7 @@ Pour les voyageurs traversant plusieurs pays des Balkans, le Balkan Flexipass pe
 
 - Bosnie-Herzégovine (ZFBH),
 - Bulgarie (BDZ),
-- Macédoine du Nord (MŽ-Transport),
+- Macédoine du Nord (ŽRSM),
 - Grèce (HT & Attica),
 - Monténégro (ŽPCG),
 - Roumanie (CFR Calatori & Regiotrans),
diff --git a/content/operator/zfbh/index.de.md b/content/operator/zfbh/index.de.md
index 49535648e..ff5b5cbb8 100644
--- a/content/operator/zfbh/index.de.md
+++ b/content/operator/zfbh/index.de.md
@@ -76,7 +76,7 @@ Für Reisende durch mehrere Balkanländer kann sich der _Balkan Flexipass_ preis
 
 - Bosnien und Herzegowina (ŽFBH, ŽRS),
 - Bulgarien (BDŽ),
-- Nordmazedonien (MŽ-Transport),
+- Nordmazedonien (ŽRSM),
 - Griechenland (HT & Attica),
 - Montenegro (ŽPCG),
 - Rumänien (CFR Calatori & Regiotrans),
diff --git a/content/operator/zfbh/index.en.md b/content/operator/zfbh/index.en.md
index cc22f30ce..5f260081f 100644
--- a/content/operator/zfbh/index.en.md
+++ b/content/operator/zfbh/index.en.md
@@ -76,7 +76,7 @@ For travellers crossing several Balkan countries, the _Balkan Flexipass_ may be
 
 - Bosnia and Herzegovina (ŽFBH, ŽRS),
 - Bulgaria (BDŽ),
-- North Macedonia (MŽ-Transport),
+- North Macedonia (ŽRSM),
 - Greece (HT & Attica),
 - Montenegro (ŽPCG),
 - Romania (CFR Calatori & Regiotrans),
diff --git a/content/operator/zfbh/index.fr.md b/content/operator/zfbh/index.fr.md
index 9d4ad5996..7c8bf030a 100644
--- a/content/operator/zfbh/index.fr.md
+++ b/content/operator/zfbh/index.fr.md
@@ -76,7 +76,7 @@ Pour les voyageurs traversant plusieurs pays des Balkans, le _Balkan Flexipass_
 
 - Bosnie-Herzégovine (ŽFBH, ŽRS),
 - Bulgarie (BDŽ),
-- Macédoine du Nord (MŽ-Transport),
+- Macédoine du Nord (ŽRSM),
 - Grèce (HT & Attica),
 - Monténégro (ŽPCG),
 - Roumanie (CFR Calatori & Regiotrans),
diff --git a/content/operator/zpcg/index.de.md b/content/operator/zpcg/index.de.md
index 144edc230..1565bd1ec 100644
--- a/content/operator/zpcg/index.de.md
+++ b/content/operator/zpcg/index.de.md
@@ -123,7 +123,7 @@ Für Reisende durch mehrere Balkanländer kann sich der _Balkan Flexipass_ preis
 
 - Bosnien und Herzegowina (ŽFBH, ŽRS),
 - Bulgarien (BDŽ),
-- Nordmazedonien (MŽ-Transport),
+- Nordmazedonien (ŽRSM),
 - Griechenland (HT & Attica),
 - Montenegro (ŽPCG),
 - Rumänien (CFR Calatori & Regiotrans),
diff --git a/content/operator/zpcg/index.en.md b/content/operator/zpcg/index.en.md
index 50d9090b9..0a6026296 100644
--- a/content/operator/zpcg/index.en.md
+++ b/content/operator/zpcg/index.en.md
@@ -125,7 +125,7 @@ For travellers through several Balkan countries, the Balkan Flexipass could be w
 
 - Bosnia and Herzegovina (ZFBH),
 - Bulgaria (BDZ),
-- North Macedonia (MŽ-Transport),
+- North Macedonia (ŽRSM),
 - Greece (HT & Attica),
 - Montenegro (ŽPCG),
 - Romania (CFR Calatori & Regiotrans),
diff --git a/content/operator/zpcg/index.fr.md b/content/operator/zpcg/index.fr.md
index ac8211e41..8d4ce793e 100644
--- a/content/operator/zpcg/index.fr.md
+++ b/content/operator/zpcg/index.fr.md
@@ -125,7 +125,7 @@ Pour les voyageurs traversant plusieurs pays des Balkans, le Balkan Flexipass pe
 
 - Bosnie-Herzégovine (ZFBH),
 - Bulgarie (BDZ),
-- Macédoine du Nord (MŽ-Transport),
+- Macédoine du Nord (ŽRSM),
 - Grèce (HT & Attica),
 - Monténégro (ŽPCG),
 - Roumanie (CFR Calatori & Regiotrans),
diff --git a/content/operator/zrs/index.de.md b/content/operator/zrs/index.de.md
index 7885a8be5..64be3a80a 100644
--- a/content/operator/zrs/index.de.md
+++ b/content/operator/zrs/index.de.md
@@ -63,7 +63,7 @@ Für Reisende durch mehrere Balkanländer kann sich der _Balkan Flexipass_ preis
 
 - Bosnien und Herzegowina (ŽFBH, ŽRS),
 - Bulgarien (BDŽ),
-- Nordmazedonien (MŽ-Transport),
+- Nordmazedonien (ŽRSM),
 - Griechenland (HT & Attica),
 - Montenegro (ŽPCG),
 - Rumänien (CFR Calatori & Regiotrans),
diff --git a/content/operator/zrs/index.en.md b/content/operator/zrs/index.en.md
index 82b4c5339..3bc7f967e 100644
--- a/content/operator/zrs/index.en.md
+++ b/content/operator/zrs/index.en.md
@@ -61,7 +61,7 @@ For travellers crossing several Balkan countries, the _Balkan Flexipass_ may be
 
 - Bosnia and Herzegovina (ŽFBH, ŽRS),
 - Bulgaria (BDŽ),
-- North Macedonia (MŽ-Transport),
+- North Macedonia (ŽRSM),
 - Greece (HT & Attica),
 - Montenegro (ŽPCG),
 - Romania (CFR Calatori & Regiotrans),
diff --git a/content/operator/zrs/index.fr.md b/content/operator/zrs/index.fr.md
index cb84993c7..d8d846bb0 100644
--- a/content/operator/zrs/index.fr.md
+++ b/content/operator/zrs/index.fr.md
@@ -61,7 +61,7 @@ Pour les voyageurs traversant plusieurs pays des Balkans, le _Balkan Flexipass_
 
 - Bosnie-Herzégovine (ŽFBH, ŽRS),
 - Bulgarie (BDŽ),
-- Macédoine du Nord (MŽ-Transport),
+- Macédoine du Nord (ŽRSM),
 - Grèce (HT & Attica),
 - Monténégro (ŽPCG),
 - Roumanie (CFR Calatori & Regiotrans),
diff --git a/content/operator/zrsm/image.webp b/content/operator/zrsm/image.webp
new file mode 100644
index 000000000..97652e0c5
Binary files /dev/null and b/content/operator/zrsm/image.webp differ
diff --git a/content/operator/zrsm/index.de.md b/content/operator/zrsm/index.de.md
new file mode 100644
index 000000000..fcd431df0
--- /dev/null
+++ b/content/operator/zrsm/index.de.md
@@ -0,0 +1,134 @@
+---
+title: "ŽRSM"
+country:
+  - "north-macedonia"
+operator: "zrsm"
+---
+
+Železnici na Republika Severna Makedonija (ŽRSM) ist die staatliche Eisenbahngesellschaft Nordmazedoniens. Die Tochtergesellschaft ŽRSM Transport betreibt den Zugverkehr im Land.
+
+## Zusammenfassung
+
+- FIP 50 Tickets und Freifahrtscheine werden akzeptiert.
+- Der Verkauf von FIP ermäßigten Tickets findet nur vor Ort statt.
+
+## Gültigkeit FIP Tickets
+
+{{< fip-validity type="fip-coupon" status="valid" >}}
+{{< fip-validity type="fip-reduced-ticket" status="valid" >}}
+
+FIP Freifahrtscheine und FIP 50 Tickets sind auf Verbindungen der ŽRSM gültig. Grenzüberschreitende Verbindungen werden derzeit nicht angeboten.
+
+## Zugkategorien und Reservierungen
+
+{{% train-category
+    id="ir"
+    title="Interregionalzug (IR)"
+    type="regional"
+    fip_accepted=true
+    reservation_required=false
+    reservation_possible=true
+    route_overview_url="https://mzt.mk/poagane-od-skopje/"
+%}}
+
+Interregionalzüge der ŽRSM. Zum Einsatz kommen Diesel- und Elektrotriebzüge.
+
+#### Reservierungen
+
+Es sind keine Reservierungen notwendig.[^2] Optional können Sitzplatzreservierungen an Ticketschaltern der ŽRSM vorgenommen werden.
+
+#### Strecken im Linienverkehr
+
+Im aktuellen Fahrplanjahr gibt es Zugverkehr auf folgenden Strecken:
+
+- Skopje – Veles – Gevgelija
+- Skopje – Veles – Prilep – Bitola – Žabeni
+
+{{% /train-category %}}
+
+{{% train-category
+    id="r"
+    title="Regionalzug (R)"
+    type="regional"
+    fip_accepted=true
+    reservation_required=false
+    reservation_possible=true
+    route_overview_url="https://mzt.mk/poagane-od-skopje/"
+%}}
+
+Regionalzüge der ŽRSM. Zum Einsatz kommen Diesel- und Elektrotriebzüge.
+
+#### Reservierungen
+
+Es sind keine Reservierungen notwendig.[^2] Optional können Sitzplatzreservierungen an Ticketschaltern der ŽRSM vorgenommen werden.
+
+#### Strecken im Linienverkehr
+
+Im aktuellen Fahrplanjahr gibt es Zugverkehr auf folgenden Strecken:
+
+- Skopje – Zelenikovo
+- Skopje – Kumanovo
+
+{{% /train-category %}}
+
+{{% train-category
+    id="bus"
+    title="Bus"
+    type="bus"
+    fip_accepted=false
+    reservation_possible=nil
+%}}
+
+FIP Freifahrtscheine gelten nicht in Bussen, die von der ŽRSM betrieben werden. In Bussen des Schienenersatzverkehrs gelten FIP Vergünstigungen, wenn sie einen Zug ersetzen, in dem FIP gültig gewesen wäre. [^1]
+
+{{% /train-category %}}
+
+## Ticket- und Reservierungskauf
+
+### Vor Ort
+
+{{% booking id="zrsm-ticket-office" /%}}
+
+### Im Zug
+
+Fahrkarten mit FIP Rabatt können nicht im Zug gekauft werden.[^1]
+
+## Ermäßigungen
+
+{{< children-discount >}}
+
+| Alter                                | Ermäßigung                                                             |
+| ------------------------------------ | ---------------------------------------------------------------------- |
+| {{< icon "stroller" >}} 0–3 Jahre    | Kostenlos, sofern für sie kein eigener Sitzplatz beansprucht wird.[^3] |
+| {{< icon "child_care" >}} 4–11 Jahre | 50% Ermäßigung [^3]                                                    |
+| {{< icon "person" >}} ab 12 Jahre    | Regulärer Preis[^3]                                                    |
+
+Weitere Ermäßigungen:
+
+- Am ersten und dritten Wochenende des Monats können Personen bis 27 Jahren kostenlos mit der ŽRSM reisen.[^3]
+- Am zweiten Wochenende des Monats können Frauen über 62 und Männer über 64 Jahren kostenlos mit der ŽRSM reisen.[^3]
+- Jeden Donnerstag können Studierende kostenlos mit der ŽRSM reisen.[^3]
+- Jeden Mittwoch können Schüler:innen kostenlos mit der ŽRSM reisen.[^3]
+
+{{% highlight tip %}}
+Für Reisende durch mehrere Balkanländer kann sich der _Balkan Flexipass_ preislich lohnen. Er ermöglicht unbegrenzte Fahrten auf den Eisenbahnnetzen von:
+
+- Bosnien und Herzegowina (ŽFBH, ŽRS),
+- Bulgarien (BDŽ),
+- Nordmazedonien (ŽRSM),
+- Griechenland (HT & Attica),
+- Montenegro (ŽPCG),
+- Rumänien (CFR Calatori & Regiotrans),
+- Serbien (SV),
+- Türkei (TCDD).
+
+[Weitere Informationen auf der ŽPCG-Website](https://zpcg.me/en/medjunarodni-prevoz/povlastice)
+{{% /highlight %}}
+
+## Quellen
+
+[^1]: [Rail Delivery Group – North Macedonia](https://www.raildeliverygroup.com/rst/europe-and-fip/countries/469782284-north-macedonia.html)
+
+[^2]: [Interrail – Trains in North Macedonia](https://www.interrail.com/en/plan-your-trip/tips-and-tricks/trains-europe/trains-country/trains-north-macedonia#1790242029008339)
+
+[^3]: [ŽRSM – Fahrplan](https://mzt.mk/%d0%b2-%d0%be-%d0%b7-%d0%b5-%d0%bd-%d1%80-%d0%b5-%d0%b4-14-12-2025-12-12-2026/)
diff --git a/content/operator/zrsm/index.en.md b/content/operator/zrsm/index.en.md
new file mode 100644
index 000000000..ecb15f698
--- /dev/null
+++ b/content/operator/zrsm/index.en.md
@@ -0,0 +1,134 @@
+---
+title: "ŽRSM"
+country:
+  - "north-macedonia"
+operator: "zrsm"
+---
+
+Železnici na Republika Severna Makedonija (ŽRSM) is the state railway company of North Macedonia. The subsidiary ŽRSM Transport operates passenger rail services in the country.
+
+## Summary
+
+- FIP 50 tickets and FIP coupons are accepted.
+- FIP discounted tickets are sold only on site.
+
+## Validity of FIP Tickets
+
+{{< fip-validity type="fip-coupon" status="valid" >}}
+{{< fip-validity type="fip-reduced-ticket" status="valid" >}}
+
+FIP coupons and FIP 50 tickets are valid on ŽRSM services. Cross-border journeys are currently not offered.
+
+## Train Categories and Reservations
+
+{{% train-category
+    id="ir"
+    title="Interregional train (IR)"
+    type="regional"
+    fip_accepted=true
+    reservation_required=false
+    reservation_possible=true
+    route_overview_url="https://mzt.mk/poagane-od-skopje/"
+%}}
+
+Interregional trains of the ŽRSM. Diesel and electric multiple units are used.
+
+#### Reservations
+
+Reservations are not required.[^2] Optionally, seat reservations can be made at ŽRSM ticket offices.
+
+#### Scheduled routes
+
+The current timetable includes rail services on the following routes:
+
+- Skopje – Veles – Gevgelija
+- Skopje – Veles – Prilep – Bitola – Žabeni
+
+{{% /train-category %}}
+
+{{% train-category
+    id="r"
+    title="Regional train (R)"
+    type="regional"
+    fip_accepted=true
+    reservation_required=false
+    reservation_possible=true
+    route_overview_url="https://mzt.mk/poagane-od-skopje/"
+%}}
+
+Regional trains of the ŽRSM. Diesel and electric multiple units are used.
+
+#### Reservations
+
+Reservations are not required.[^2] Optionally, seat reservations can be made at ŽRSM ticket offices.
+
+#### Scheduled routes
+
+The current timetable includes rail services on the following routes:
+
+- Skopje – Zelenikovo
+- Skopje – Kumanovo
+
+{{% /train-category %}}
+
+{{% train-category
+    id="bus"
+    title="Bus"
+    type="bus"
+    fip_accepted=false
+    reservation_possible=nil
+%}}
+
+FIP coupons are not valid on buses operated by ŽRSM. On replacement buses, FIP discounts apply if they replace a train on which FIP would have been valid. [^1]
+
+{{% /train-category %}}
+
+## Ticket and Reservation Purchase
+
+### On-Site
+
+{{% booking id="zrsm-ticket-office" /%}}
+
+### On the Train
+
+Tickets with an FIP discount cannot be purchased on the train.[^1]
+
+## Discounts
+
+{{< children-discount >}}
+
+| Age                                  | Discount                                         |
+| ------------------------------------ | ------------------------------------------------ |
+| {{< icon "stroller" >}} 0–3 years    | Free, provided no separate seat is required.[^3] |
+| {{< icon "child_care" >}} 4–11 years | 50% discount[^3]                                 |
+| {{< icon "person" >}} from 12 years  | Regular price[^3]                                |
+
+Further discounts:
+
+- On the first and third weekend of the month, people up to 27 years of age can travel free on the ŽRSM.[^3]
+- On the second weekend of the month, women over 62 and men over 64 can travel free on the ŽRSM.[^3]
+- Students can travel free on the ŽRSM every Thursday.[^3]
+- Schoolchildren can travel free on the ŽRSM every Wednesday.[^3]
+
+{{% highlight tip %}}
+For travellers crossing several Balkan countries, the _Balkan Flexipass_ may be worthwhile. It allows unlimited travel on the railway networks of:
+
+- Bosnia and Herzegovina (ŽFBH, ŽRS),
+- Bulgaria (BDŽ),
+- North Macedonia (ŽRSM),
+- Greece (HT & Attica),
+- Montenegro (ŽPCG),
+- Romania (CFR Calatori & Regiotrans),
+- Serbia (SV),
+- Turkey (TCDD).
+
+[Further information on the ŽPCG website](https://zpcg.me/en/medjunarodni-prevoz/povlastice)
+{{% /highlight %}}
+
+## Sources
+
+[^1]: [Rail Delivery Group – North Macedonia](https://www.raildeliverygroup.com/rst/europe-and-fip/countries/469782284-north-macedonia.html)
+
+[^2]: [Interrail – Trains in North Macedonia](https://www.interrail.com/en/plan-your-trip/tips-and-tricks/trains-europe/trains-country/trains-north-macedonia#1790242029008339)
+
+[^3]: [ŽRSM – Timetable](https://mzt.mk/%d0%b2-%d0%be-%d0%b7-%d0%b5-%d0%bd-%d1%80-%d0%b5-%d0%b4-14-12-2025-12-12-2026/)
diff --git a/content/operator/zrsm/index.fr.md b/content/operator/zrsm/index.fr.md
new file mode 100644
index 000000000..9ff9759b7
--- /dev/null
+++ b/content/operator/zrsm/index.fr.md
@@ -0,0 +1,134 @@
+---
+title: "ŽRSM"
+country:
+  - "north-macedonia"
+operator: "zrsm"
+---
+
+Železnici na Republika Severna Makedonija (ŽRSM) est la compagnie ferroviaire nationale de la Macédoine du Nord. La filiale ŽRSM Transport exploite le trafic ferroviaire voyageurs dans le pays.
+
+## Résumé
+
+- Les billets FIP 50 et les coupons FIP sont acceptés.
+- Les billets à tarif réduit FIP sont vendus uniquement sur place.
+
+## Validité des Billets FIP
+
+{{< fip-validity type="fip-coupon" status="valid" >}}
+{{< fip-validity type="fip-reduced-ticket" status="valid" >}}
+
+Les coupons FIP et les billets FIP 50 sont valables sur les services de la ŽRSM. Les voyages transfrontaliers ne sont actuellement pas proposés.
+
+## Catégories de trains et réservations
+
+{{% train-category
+    id="ir"
+    title="Train interrégional (IR)"
+    type="regional"
+    fip_accepted=true
+    reservation_required=false
+    reservation_possible=true
+    route_overview_url="https://mzt.mk/poagane-od-skopje/"
+%}}
+
+Trains interrégionaux de la ŽRSM. Des automotrices diesel et électriques sont utilisées.
+
+#### Réservations
+
+Les réservations ne sont pas nécessaires.[^2] Il est possible, en option, de réserver des places assises dans les guichets de la ŽRSM.
+
+#### Lignes régulières
+
+Le plan de circulation actuel prévoit des services ferroviaires sur les lignes suivantes :
+
+- Skopje – Veles – Gevgelija
+- Skopje – Veles – Prilep – Bitola – Žabeni
+
+{{% /train-category %}}
+
+{{% train-category
+    id="r"
+    title="Train régional (R)"
+    type="regional"
+    fip_accepted=true
+    reservation_required=false
+    reservation_possible=true
+    route_overview_url="https://mzt.mk/poagane-od-skopje/"
+%}}
+
+Trains régionaux de la ŽRSM. Des autorails diesel et électriques sont utilisés.
+
+#### Réservations
+
+Les réservations ne sont pas nécessaires.[^2] Il est possible, en option, de réserver des places assises dans les guichets de la ŽRSM.
+
+#### Lignes régulières
+
+Le plan de circulation actuel prévoit des services ferroviaires sur les lignes suivantes :
+
+- Skopje – Zelenikovo
+- Skopje – Kumanovo
+
+{{% /train-category %}}
+
+{{% train-category
+    id="bus"
+    title="Bus"
+    type="bus"
+    fip_accepted=false
+    reservation_possible=nil
+%}}
+
+Les coupons FIP ne sont pas valables dans les bus exploités par la ŽRSM. Dans les bus de remplacement, les réductions FIP s’appliquent si ces bus remplacent un train pour lequel le billet FIP aurait été valable. [^1]
+
+{{% /train-category %}}
+
+## Achat de billets et réservations
+
+### En gare
+
+{{% booking id="zrsm-ticket-office" /%}}
+
+### À bord du train
+
+Les billets avec réduction FIP ne peuvent pas être achetés à bord du train.[^1]
+
+## Réductions
+
+{{< children-discount >}}
+
+| Âge                                      | Réduction                                                                  |
+| ---------------------------------------- | -------------------------------------------------------------------------- |
+| {{< icon "stroller" >}} 0–3 ans          | Gratuit, à condition qu’aucune place assise distincte ne soit requise.[^3] |
+| {{< icon "child_care" >}} 4–11 ans       | 50 % de réduction[^3]                                                      |
+| {{< icon "person" >}} à partir de 12 ans | Tarif normal[^3]                                                           |
+
+Autres réductions :
+
+- Le premier et le troisième week-end du mois, les personnes jusqu’à 27 ans peuvent voyager gratuitement avec la ŽRSM.[^3]
+- Le deuxième week-end du mois, les femmes de plus de 62 ans et les hommes de plus de 64 ans peuvent voyager gratuitement avec la ŽRSM.[^3]
+- Les étudiants peuvent voyager gratuitement avec la ŽRSM tous les jeudis.[^3]
+- Les écoliers peuvent voyager gratuitement avec la ŽRSM tous les mercredis.[^3]
+
+{{% highlight tip %}}
+Pour les voyageurs traversant plusieurs pays des Balkans, le _Balkan Flexipass_ peut être intéressant. Il permet de voyager illimitément sur les réseaux ferroviaires de :
+
+- Bosnie-Herzégovine (ŽFBH, ŽRS),
+- Bulgarie (BDŽ),
+- Macédoine du Nord (ŽRSM),
+- Grèce (HT & Attica),
+- Monténégro (ŽPCG),
+- Roumanie (CFR Calatori & Regiotrans),
+- Serbie (SV),
+- Turquie (TCDD).
+
+[Plus d’informations sur le site web de la ŽPCG](https://zpcg.me/en/medjunarodni-prevoz/povlastice)
+{{% /highlight %}}
+
+## Sources
+
+[^1]: [Rail Delivery Group – North Macedonia](https://www.raildeliverygroup.com/rst/europe-and-fip/countries/469782284-north-macedonia.html)
+
+[^2]: [Interrail – Trains in North Macedonia](https://www.interrail.com/en/plan-your-trip/tips-and-tricks/trains-europe/trains-country/trains-north-macedonia#1790242029008339)
+
+[^3]: [ŽRSM – Horaires](https://mzt.mk/%d0%b2-%d0%be-%d0%b7-%d0%b5-%d0%bd-%d1%80-%d0%b5-%d0%b4-14-12-2025-12-12-2026/)
diff --git a/layouts/_partials/content.html b/layouts/_partials/content.html
index 0a2404a61..8a0032f2b 100644
--- a/layouts/_partials/content.html
+++ b/layouts/_partials/content.html
@@ -3,8 +3,8 @@
     | replaceRE "<br>" "<br aria-hidden=\"true\">"
     | replaceRE "z. B. " "z.&nbsp;B.&nbsp;"
     | replaceRE "FIP 50" "FIP&nbsp;50"
-    | replaceRE "([0-9]+) (€|DKK|CHF|CZK|£|PLN|HUF|RON)" "${1}&nbsp;${2}"
-    | replaceRE "(€|DKK|CHF|CZK|£|PLN|HUF|RON) ([0-9]+)" "${1}&nbsp;${2}"
+    | replaceRE "([0-9]+) (€|DKK|CHF|CZK|£|PLN|HUF|RON|MKD)" "${1}&nbsp;${2}"
+    | replaceRE "(€|DKK|CHF|CZK|£|PLN|HUF|RON|MKD) ([0-9]+)" "${1}&nbsp;${2}"
     | safeHTML
   }}
 {{- end -}}
diff --git a/static/map_europe.svg b/static/map_europe.svg
index f625eb1b0..959f4b0b4 100644
--- a/static/map_europe.svg
+++ b/static/map_europe.svg
@@ -1975,7 +1975,7 @@
          style="fill:#c0c1c5;fill-opacity:1;stroke:none" />
     </g>
     <g
-       id="north_macedonia"
+       id="north-macedonia"
        transform="matrix(7.2635634,0,0,7.2635634,-807.13774,-1896.7703)"
        style="fill:#c0c1c5;fill-opacity:1;stroke:none">
       <path