diff --git a/data/presets.yaml b/data/presets.yaml
index a52c91f0c..cfcf5c405 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3100,6 +3100,11 @@ en:
         # barrier=gate
         name: Gate
         terms: '<translate with synonyms or related terms for ''Gate'', separated by commas>'
+      barrier/guard_rail:
+        # barrier=guard_rail
+        name: Guard Rail
+        # 'terms: railing,guardrail,traffic barrier,crash barrier,median barrier,roadside barrier,Armco barrier'
+        terms: '<translate with synonyms or related terms for ''Guard Rail'', separated by commas>'
       barrier/hedge:
         # barrier=hedge
         name: Hedge
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 964979c89..6439f89a3 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -235,6 +235,7 @@
     "barrier/ditch": {"icon": "maki-roadblock", "geometry": ["line", "area"], "tags": {"barrier": "ditch"}, "name": "Trench", "matchScore": 0.25},
     "barrier/fence": {"icon": "maki-fence", "fields": ["fence_type", "height"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25},
     "barrier/gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"},
+    "barrier/guard_rail": {"icon": "maki-barrier", "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["railing", "guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75},
     "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25},
     "barrier/kerb": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"},
     "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"},
diff --git a/data/presets/presets/barrier/guard_rail.json b/data/presets/presets/barrier/guard_rail.json
new file mode 100644
index 000000000..061d1ebf0
--- /dev/null
+++ b/data/presets/presets/barrier/guard_rail.json
@@ -0,0 +1,20 @@
+{
+    "icon": "maki-barrier",
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "barrier": "guard_rail"
+    },
+    "name": "Guard Rail",
+    "terms": [
+        "railing",
+        "guardrail",
+        "traffic barrier",
+        "crash barrier",
+        "median barrier",
+        "roadside barrier",
+        "Armco barrier"
+    ],
+    "matchScore": 0.75
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 66c0a6ba4..e14e0b88f 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1597,6 +1597,13 @@
       "object_types": ["node", "way"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"
     },
+    {
+      "key": "barrier",
+      "value": "guard_rail",
+      "description": "Guard Rail",
+      "object_types": ["way"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"
+    },
     {
       "key": "barrier",
       "value": "hedge",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 027c4f1e9..2493f0b34 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4116,6 +4116,10 @@
                     "name": "Gate",
                     "terms": ""
                 },
+                "barrier/guard_rail": {
+                    "name": "Guard Rail",
+                    "terms": "railing,guardrail,traffic barrier,crash barrier,median barrier,roadside barrier,Armco barrier"
+                },
                 "barrier/hedge": {
                     "name": "Hedge",
                     "terms": ""