diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index 9f9ddb2a2d..d9ce560d78 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -4,6 +4,11 @@ shelter=yes : amenity=shelter
 toilets=yes : amenity=toilets
 restaurant=yes : amenity=restaurant
 hotel=yes : tourism=hotel
+ford=boat : highway=ford
+ford=intermittent : highway=ford
+ford=seasonal : highway=ford
+ford=stream : highway=ford
+ford=stepping_stones : highway=ford
 ford=yes : highway=ford
 ruins=yes : historic=ruins
 drinkable=yes : amenity=drinking_water
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index b3a7b2e4aa..7aef900c93 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -2063,8 +2063,9 @@ line|z16-[barrier=gate],
 line|z16-[barrier=stile],
 {icon-image: dot-m.svg;font-size: 11;}
 
+node|z16-[highway=ford],
 line|z16-[power=tower]
-shelter{icon-image: dot-m.svg;}
+{icon-image: dot-m.svg;}
 
 node|z16-[amenity=taxi],
 area|z16-[amenity=taxi]
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 5e0ec2849a..7cba50da69 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -220,6 +220,8 @@ area|z12-[leisure=nature_reserve]
 {text: name;text-color: @park_label;text-halo-opacity: 0.75;text-halo-color: @label_halo_light;text-halo-radius:0.4;}
 
 
+node|z14-[highway=ford]
+{icon-image: dot-m.svg;icon-min-distance: 20;}
 
 /*node|z11[landuse=forest][boundary=national_park],
 area|z11[landuse=forest][boundary=national_park],
diff --git a/generator/road_access_generator.cpp b/generator/road_access_generator.cpp
index 87e27f023f..c8ad1eee26 100644
--- a/generator/road_access_generator.cpp
+++ b/generator/road_access_generator.cpp
@@ -117,6 +117,7 @@ TagMapping const kDefaultTagMapping = {
   {OsmElement::Tag("access", "no"), RoadAccess::Type::No},
   {OsmElement::Tag("access", "private"), RoadAccess::Type::Private},
   {OsmElement::Tag("access", "destination"), RoadAccess::Type::Destination},
+  {OsmElement::Tag("highway", "ford"), RoadAccess::Type::No}
 };
 
 set<OsmElement::Tag> const kHighwaysWhereIgnorePrivateAccessForCar = {