diff --git a/data/classificator.txt b/data/classificator.txt
index e424b64133..b9b20aaea9 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -839,6 +839,7 @@ world  +
                 beijing  -
                 bengalore  -
                 berlin  -
+                bilbao  -
                 brasilia  -
                 brescia  -
                 brussels  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 7f8ec41dcb..1dd5603061 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index a66866d3e5..7e7b56e2c4 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -62241,6 +62241,175 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-bilbao"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-bilbao-s"
+      apply_for_type: 1
+      priority: 16952
+      min_distance: 1
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-bilbao-s"
+      apply_for_type: 1
+      priority: 16952
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2236962
+        stroke_color: 1308622847
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 2236962
+        stroke_color: 1308622847
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+}
 cont {
   name: "railway-station-subway-brasilia"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index ae0febc23a..e80c954594 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index c5cf099fbf..f1feefa1b5 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -61737,6 +61737,175 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-bilbao"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-bilbao-s"
+      apply_for_type: 1
+      priority: 16952
+      min_distance: 1
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-bilbao-s"
+      apply_for_type: 1
+      priority: 16952
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2236962
+        stroke_color: 1308622847
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 2236962
+        stroke_color: 1308622847
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+}
 cont {
   name: "railway-station-subway-brasilia"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 46a67d08e6..ddd51ccf0f 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index edd9f31e9a..aeb1014a9b 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -61822,6 +61822,175 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-bilbao"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-bilbao-s"
+      apply_for_type: 1
+      priority: 16952
+      min_distance: 1
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-bilbao-s"
+      apply_for_type: 1
+      priority: 16952
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 11
+        color: 8947848
+        stroke_color: 1292964096
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 8947848
+        stroke_color: 1292964096
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 12
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16952
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15952
+    }
+  }
+}
 cont {
   name: "railway-station-subway-brasilia"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index d8469e8a99..5f9307e339 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 1e3fa096c8..ed6b6afcea 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -42687,6 +42687,178 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-bilbao"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-bilbao-s"
+      apply_for_type: 1
+      priority: 16917
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3355443
+        stroke_color: 1728053247
+        offset_y: 1
+      }
+      secondary {
+        height: 9
+        color: 3355443
+        stroke_color: 1728053247
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-bilbao-s"
+      apply_for_type: 1
+      priority: 16917
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 1308622847
+        offset_y: 1
+      }
+      secondary {
+        height: 10
+        color: 3355443
+        stroke_color: 1308622847
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16917
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+        offset_y: 1
+      }
+      secondary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16917
+    }
+    caption {
+      primary {
+        height: 13
+        color: 3355443
+        stroke_color: 872415231
+        offset_y: 1
+      }
+      secondary {
+        height: 11
+        color: 3355443
+        stroke_color: 872415231
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16917
+    }
+    caption {
+      primary {
+        height: 14
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+      }
+      secondary {
+        height: 12
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16917
+    }
+    caption {
+      primary {
+        height: 14
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+      }
+      secondary {
+        height: 12
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16917
+    }
+    caption {
+      primary {
+        height: 14
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+      }
+      secondary {
+        height: 12
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+}
 cont {
   name: "railway-station-subway-brasilia"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 7da31c5db4..2bd5b332d4 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 91a7c8c70d..f35269fd8e 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -43011,6 +43011,178 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-bilbao"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-bilbao-s"
+      apply_for_type: 1
+      priority: 16917
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 11
+        color: 8947848
+        stroke_color: 1712394496
+        offset_y: 1
+      }
+      secondary {
+        height: 9
+        color: 8947848
+        stroke_color: 1712394496
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-bilbao-s"
+      apply_for_type: 1
+      priority: 16917
+    }
+    caption {
+      primary {
+        height: 12
+        color: 8947848
+        stroke_color: 1292964096
+        offset_y: 1
+      }
+      secondary {
+        height: 10
+        color: 8947848
+        stroke_color: 1292964096
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16917
+    }
+    caption {
+      primary {
+        height: 12
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+      }
+      secondary {
+        height: 10
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16917
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16917
+    }
+    caption {
+      primary {
+        height: 14
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+      }
+      secondary {
+        height: 12
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16917
+    }
+    caption {
+      primary {
+        height: 14
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+      }
+      secondary {
+        height: 12
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-bilbao-m"
+      apply_for_type: 1
+      priority: 16917
+    }
+    caption {
+      primary {
+        height: 14
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+      }
+      secondary {
+        height: 12
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+      }
+      priority: 15917
+    }
+  }
+}
 cont {
   name: "railway-station-subway-brasilia"
   element {
diff --git a/data/types.txt b/data/types.txt
index 0222ab2109..c9ca7facce 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1402,7 +1402,7 @@ amenity|recycling|container
 *railway|station|subway|lille
 *railway|station|subway|lima
 *railway|station|subway|lisboa
-mapswithme
+*railway|station|subway|bilbao
 *railway|station|subway|lyon
 *railway|station|subway|malaga
 *railway|station|subway|manila
diff --git a/data/visibility.txt b/data/visibility.txt
index 4bd39d0a6a..16864e4f38 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -839,6 +839,7 @@ world  00000000000000000000  +
                 beijing  00000000000001111111  -
                 bengalore  00000000000001111111  -
                 berlin  00000000000001111111  -
+                bilbao  00000000000001111111  -
                 brasilia  00000000000001111111  -
                 brescia  00000000000001111111  -
                 brussels  00000000000001111111  -