diff --git a/layers/poi/mapping.yaml b/layers/poi/mapping.yaml
index 07701b2..dfbf039 100644
--- a/layers/poi/mapping.yaml
+++ b/layers/poi/mapping.yaml
@@ -325,6 +325,9 @@ tables:
     - name: station
       key: station
       type: string
+    - name: funicular
+      key: funicular
+      type: string
     mapping:
       aerialway: *poi_mapping_aerialway
       amenity: *poi_mapping_amenity
@@ -366,6 +369,9 @@ tables:
     - name: station
       key: station
       type: string
+    - name: funicular
+      key: funicular
+      type: string
     mapping:
       aerialway: *poi_mapping_aerialway
       amenity: *poi_mapping_amenity
diff --git a/layers/poi/update_poi_point.sql b/layers/poi/update_poi_point.sql
index b38c680..9c08729 100644
--- a/layers/poi/update_poi_point.sql
+++ b/layers/poi/update_poi_point.sql
@@ -8,6 +8,10 @@ BEGIN
     SET subclass = 'subway'
     WHERE station = 'subway' and subclass='station';
 
+  UPDATE osm_poi_point
+    SET subclass = 'halt'
+    WHERE funicular = 'yes' and subclass='station';
+
   UPDATE osm_poi_point
   SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
diff --git a/layers/poi/update_poi_polygon.sql b/layers/poi/update_poi_polygon.sql
index a27b869..e23cefd 100644
--- a/layers/poi/update_poi_polygon.sql
+++ b/layers/poi/update_poi_polygon.sql
@@ -17,6 +17,10 @@ BEGIN
   SET subclass = 'subway'
   WHERE station = 'subway' and subclass='station';
 
+  UPDATE osm_poi_polygon
+    SET subclass = 'halt'
+    WHERE funicular = 'yes' and subclass='station';
+
   UPDATE osm_poi_polygon
   SET tags = slice_language_tags(tags) || get_basic_names(tags, geometry)
   WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;