diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 5d02a1b160..be402125e5 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1545,3 +1545,4 @@ railway|subway_entrance|washington;[railway=subway_entrance][city=washington];;n
 railway|subway_entrance|wuhan;[railway=subway_entrance][city=wuhan];;name;int_name;1547;
 railway|subway_entrance|yerevan;[railway=subway_entrance][city=yerevan];;name;int_name;1548;
 railway|subway_entrance|yokohama;[railway=subway_entrance][city=yokohama];;name;int_name;1549;
+railway|subway_entrance|bilbao;[railway=subway_entrance][city=bilbao];;name;int_name;1550;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index ee03991058..fb6c8514a7 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -18735,6 +18735,9 @@
 
   [type.railway.station.subway.berlin]
     ref = type.railway.station.subway
+    
+  [type.railway.station.subway.bilbao]
+    ref = type.railway.station.subway
 
   [type.railway.station.subway.brasilia]
     ref = type.railway.station.subway
@@ -19036,7 +19039,7 @@
     it = Binari della metrò
     mr = भुयारी मार्गिका
     nl = Metro
-    pt = Metropolitano
+    pt = Metro
     pt-BR = Metrô
     ru = Ветка метро
     tr = Metro Hattı
@@ -19050,8 +19053,8 @@
     fr = Voie de métro
     mr = भुयारी मार्गिका
     nl = Metrobrug
-    pt = Metropolitano
-    pt-BR = Metrô
+    pt = Ponte de metro
+    pt-BR = Ponte de metrô
     ru = Ветка метро
     tr = Metro Hattı
     uk = Лінія метро
@@ -19064,8 +19067,8 @@
     fr = Voie de métro
     mr = भुयारी मार्गिका
     nl = Metrotunnel
-    pt = Metropolitano
-    pt-BR = Metrô
+    pt = Túnel de metro
+    pt-BR = Tunel de metrô
     ru = Ветка метро
     tr = Metro Hattı
     uk = Лінія метро
@@ -19143,6 +19146,9 @@
 
   [type.railway.subway_entrance.berlin]
     ref = type.railway.subway_entrance
+    
+  [type.railway.subway_entrance.bilbao]
+    ref = type.railway.subway_entrance
 
   [type.railway.subway_entrance.brasilia]
     ref = type.railway.subway_entrance