diff --git a/data/presets.yaml b/data/presets.yaml
index ef1a7173c..6b2ed002c 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1181,6 +1181,9 @@ en:
           flush: Flush
           # 'toilets:disposal=pitlatrine'
           pitlatrine: Pit/Latrine
+      toll:
+        # toll=*
+        label: Toll
       tourism:
         # tourism=*
         label: Type
@@ -2455,6 +2458,7 @@ en:
       highway/motorway:
         # highway=motorway
         name: Motorway
+        # 'terms: autobahn,expressway,freeway,highway,interstate,parkway,thruway,turnpike'
         terms: '<translate with synonyms or related terms for ''Motorway'', separated by commas>'
       highway/motorway_junction:
         # highway=motorway_junction
diff --git a/data/presets/fields.json b/data/presets/fields.json
index b270f1d05..3a35f2386 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1591,6 +1591,11 @@
                 }
             }
         },
+        "toll": {
+            "key": "toll",
+            "type": "check",
+            "label": "Toll"
+        },
         "tourism": {
             "key": "tourism",
             "type": "typeCombo",
diff --git a/data/presets/fields/toll.json b/data/presets/fields/toll.json
new file mode 100644
index 000000000..4c5cb4999
--- /dev/null
+++ b/data/presets/fields/toll.json
@@ -0,0 +1,5 @@
+{
+    "key": "toll",
+    "type": "check",
+    "label": "Toll"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 94c419044..bd74b56ff 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5015,6 +5015,7 @@
                 "lanes",
                 "surface",
                 "maxheight",
+                "toll",
                 "ref"
             ],
             "geometry": [
@@ -5023,7 +5024,16 @@
             "tags": {
                 "highway": "motorway"
             },
-            "terms": [],
+            "terms": [
+                "autobahn",
+                "expressway",
+                "freeway",
+                "highway",
+                "interstate",
+                "parkway",
+                "thruway",
+                "turnpike"
+            ],
             "name": "Motorway"
         },
         "highway/path": {
@@ -5607,6 +5617,7 @@
                 "lanes",
                 "surface",
                 "maxheight",
+                "toll",
                 "ref"
             ],
             "geometry": [
diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json
index 28adc22ad..6a86898a2 100644
--- a/data/presets/presets/highway/motorway.json
+++ b/data/presets/presets/highway/motorway.json
@@ -8,6 +8,7 @@
         "lanes",
         "surface",
         "maxheight",
+        "toll",
         "ref"
     ],
     "geometry": [
@@ -16,6 +17,15 @@
     "tags": {
         "highway": "motorway"
     },
-    "terms": [],
+    "terms": [
+        "autobahn",
+        "expressway",
+        "freeway",
+        "highway",
+        "interstate",
+        "parkway",
+        "thruway",
+        "turnpike"
+    ],
     "name": "Motorway"
 }
diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json
index a820c1e9d..a91724862 100644
--- a/data/presets/presets/highway/trunk.json
+++ b/data/presets/presets/highway/trunk.json
@@ -8,6 +8,7 @@
         "lanes",
         "surface",
         "maxheight",
+        "toll",
         "ref"
     ],
     "geometry": [
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 86c0cfd3f..bfd2ec696 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1708,6 +1708,9 @@
                         "bucket": "Bucket"
                     }
                 },
+                "toll": {
+                    "label": "Toll"
+                },
                 "tourism": {
                     "label": "Type"
                 },
@@ -2892,7 +2895,7 @@
                 },
                 "highway/motorway": {
                     "name": "Motorway",
-                    "terms": ""
+                    "terms": "autobahn,expressway,freeway,highway,interstate,parkway,thruway,turnpike"
                 },
                 "highway/path": {
                     "name": "Path",