diff --git a/data/deprecated.json b/data/deprecated.json
index a57a9b9bc..ee71d346d 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -737,6 +737,18 @@
       "old": {"sloped_curb": "yes"},
       "replace": {"kerb": "lowered"}
     },
+    {
+      "old": {"sport": "horse_shoes"},
+      "replace": {"sport": "horseshoes"}
+    },
+    {
+      "old": {"sport": "horseshoe"},
+      "replace": {"sport": "horseshoes"}
+    },
+    {
+      "old": {"sport": "shuffle_board"},
+      "replace": {"sport": "shuffleboard"}
+    },
     {
       "old": {"theatre:type": "amphitheatre"},
       "replace": {"theatre:type": "amphi"}
diff --git a/data/presets.yaml b/data/presets.yaml
index 58f67ffa3..643710f5a 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -5136,6 +5136,11 @@ en:
         name: Riding Arena
         # 'terms: dressage,equestrian,horse,horseback,riding'
         terms: '<translate with synonyms or related terms for ''Riding Arena'', separated by commas>'
+      leisure/pitch/horseshoes:
+        # 'leisure=pitch, sport=horseshoes'
+        name: Horseshoes Pit
+        # 'terms: horse shoes'
+        terms: '<translate with synonyms or related terms for ''Horseshoes Pit'', separated by commas>'
       leisure/pitch/netball:
         # 'leisure=pitch, sport=netball'
         name: Netball Court
@@ -5148,6 +5153,11 @@ en:
         # 'leisure=pitch, sport=rugby_union'
         name: Rugby Union Field
         terms: '<translate with synonyms or related terms for ''Rugby Union Field'', separated by commas>'
+      leisure/pitch/shuffleboard:
+        # 'leisure=pitch, sport=shuffleboard'
+        name: Shuffleboard Court
+        # 'terms: deck shuffleboard,floor shuffleboard'
+        terms: '<translate with synonyms or related terms for ''Shuffleboard Court'', separated by commas>'
       leisure/pitch/skateboard:
         # 'leisure=pitch, sport=skateboard'
         name: Skate Park
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 789bc5abd..8bba4c5de 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -640,9 +640,11 @@
     "leisure/pitch/bowls": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "bowls"}, "reference": {"key": "sport", "value": "bowls"}, "terms": [], "name": "Bowling Green"},
     "leisure/pitch/cricket": {"icon": "maki-cricket", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "cricket"}, "reference": {"key": "sport", "value": "cricket"}, "terms": [], "name": "Cricket Field"},
     "leisure/pitch/equestrian": {"icon": "maki-horse-riding", "fields": ["{leisure/pitch}", "building"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "equestrian"}, "reference": {"key": "sport", "value": "equestrian"}, "terms": ["dressage", "equestrian", "horse", "horseback", "riding"], "name": "Riding Arena"},
+    "leisure/pitch/horseshoes": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "horseshoes"}, "reference": {"key": "sport", "value": "horseshoes"}, "terms": ["horse shoes"], "name": "Horseshoes Pit"},
     "leisure/pitch/netball": {"icon": "maki-volleyball", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "netball"}, "reference": {"key": "sport", "value": "netball"}, "terms": [], "name": "Netball Court"},
     "leisure/pitch/rugby_league": {"icon": "maki-american-football", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "rugby_league"}, "reference": {"key": "sport", "value": "rugby_league"}, "terms": [], "name": "Rugby League Field"},
     "leisure/pitch/rugby_union": {"icon": "maki-american-football", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "rugby_union"}, "reference": {"key": "sport", "value": "rugby_union"}, "terms": [], "name": "Rugby Union Field"},
+    "leisure/pitch/shuffleboard": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "shuffleboard"}, "reference": {"key": "sport", "value": "shuffleboard"}, "terms": ["deck shuffleboard", "floor shuffleboard"], "name": "Shuffleboard Court"},
     "leisure/pitch/skateboard": {"icon": "maki-skateboard", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "skateboard"}, "reference": {"key": "sport", "value": "skateboard"}, "terms": [], "name": "Skate Park"},
     "leisure/pitch/soccer": {"icon": "maki-soccer", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "soccer"}, "reference": {"key": "sport", "value": "soccer"}, "terms": ["football"], "name": "Soccer Field"},
     "leisure/pitch/softball": {"icon": "maki-baseball", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "softball"}, "reference": {"key": "sport", "value": "softball"}, "terms": ["softball", "diamond"], "name": "Softball Field"},
diff --git a/data/presets/presets/leisure/pitch/horseshoes.json b/data/presets/presets/leisure/pitch/horseshoes.json
new file mode 100644
index 000000000..d0a31841e
--- /dev/null
+++ b/data/presets/presets/leisure/pitch/horseshoes.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-pitch",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "leisure": "pitch",
+        "sport": "horseshoes"
+    },
+    "reference": {
+        "key": "sport",
+        "value": "horseshoes"
+    },
+    "terms": [
+        "horse shoes"
+    ],
+    "name": "Horseshoes Pit"
+}
diff --git a/data/presets/presets/leisure/pitch/shuffleboard.json b/data/presets/presets/leisure/pitch/shuffleboard.json
new file mode 100644
index 000000000..54dfe8533
--- /dev/null
+++ b/data/presets/presets/leisure/pitch/shuffleboard.json
@@ -0,0 +1,20 @@
+{
+    "icon": "maki-pitch",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "leisure": "pitch",
+        "sport": "shuffleboard"
+    },
+    "reference": {
+        "key": "sport",
+        "value": "shuffleboard"
+    },
+    "terms": [
+        "deck shuffleboard",
+        "floor shuffleboard"
+    ],
+    "name": "Shuffleboard Court"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 9718ed85c..7a92a17aa 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -618,9 +618,11 @@
     {"key": "sport", "value": "bowls", "description": "🄿 Bowling Green", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"},
     {"key": "sport", "value": "cricket", "description": "🄿 Cricket Field", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/cricket-15.svg?sanitize=true"},
     {"key": "sport", "value": "equestrian", "description": "🄿 Riding Arena, 🄵 Dressage Riding", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/horse-riding-15.svg?sanitize=true"},
+    {"key": "sport", "value": "horseshoes", "description": "🄿 Horseshoes Pit", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"},
     {"key": "sport", "value": "netball", "description": "🄿 Netball Court", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/volleyball-15.svg?sanitize=true"},
     {"key": "sport", "value": "rugby_league", "description": "🄿 Rugby League Field", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/american-football-15.svg?sanitize=true"},
     {"key": "sport", "value": "rugby_union", "description": "🄿 Rugby Union Field", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/american-football-15.svg?sanitize=true"},
+    {"key": "sport", "value": "shuffleboard", "description": "🄿 Shuffleboard Court", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"},
     {"key": "sport", "value": "skateboard", "description": "🄿 Skate Park", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skateboard-15.svg?sanitize=true"},
     {"key": "sport", "value": "soccer", "description": "🄿 Soccer Field", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/soccer-15.svg?sanitize=true"},
     {"key": "sport", "value": "softball", "description": "🄿 Softball Field", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/baseball-15.svg?sanitize=true"},
@@ -1903,6 +1905,9 @@
     {"key": "sloped_curb", "value": "low", "description": "🄳 ➜ kerb=lowered"},
     {"key": "sloped_curb", "value": "no", "description": "🄳 ➜ kerb=raised"},
     {"key": "sloped_curb", "value": "yes", "description": "🄳 ➜ kerb=lowered"},
+    {"key": "sport", "value": "horse_shoes", "description": "🄳 ➜ sport=horseshoes"},
+    {"key": "sport", "value": "horseshoe", "description": "🄳 ➜ sport=horseshoes"},
+    {"key": "sport", "value": "shuffle_board", "description": "🄳 ➜ sport=shuffleboard"},
     {"key": "theatre:type", "value": "amphitheatre", "description": "🄳 ➜ theatre:type=amphi"},
     {"key": "todo", "description": "🄳 ➜ fixme=*"},
     {"key": "TODO", "description": "🄳 ➜ fixme=*"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 978fcc3df..020e56c3c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -6827,6 +6827,10 @@
                     "name": "Riding Arena",
                     "terms": "dressage,equestrian,horse,horseback,riding"
                 },
+                "leisure/pitch/horseshoes": {
+                    "name": "Horseshoes Pit",
+                    "terms": "horse shoes"
+                },
                 "leisure/pitch/netball": {
                     "name": "Netball Court",
                     "terms": ""
@@ -6839,6 +6843,10 @@
                     "name": "Rugby Union Field",
                     "terms": ""
                 },
+                "leisure/pitch/shuffleboard": {
+                    "name": "Shuffleboard Court",
+                    "terms": "deck shuffleboard,floor shuffleboard"
+                },
                 "leisure/pitch/skateboard": {
                     "name": "Skate Park",
                     "terms": ""
@@ -9092,7 +9100,7 @@
                 "attribution": {
                     "text": "Terms & Feedback"
                 },
-                "description": "DigitalGlobe-Vivid is a mosiac with optimal aesthetics and currency for any area on the globe, 50cm resolution or better, and image currency <20 month average globally.",
+                "description": "DigitalGlobe-Vivid is a mosaic with optimal aesthetics and currency for any area on the globe, 50cm resolution or better, and image currency <20 month average globally.",
                 "name": "DigitalGlobe Vivid Imagery"
             },
             "EOXAT2018CLOUDLESS": {