diff --git a/data/presets.yaml b/data/presets.yaml
index 532ee39ec..e7a7e1c01 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -5397,6 +5397,11 @@ en:
         name: Motorcycle Dealership
         # 'terms: bike'
         terms: '<translate with synonyms or related terms for ''Motorcycle Dealership'', separated by commas>'
+      shop/motorcycle_repair:
+        # shop=motorcycle_repair
+        name: Motorcycle Repair Shop
+        # 'terms: auto,bike,garage,motorcycle,repair,service'
+        terms: '<translate with synonyms or related terms for ''Motorcycle Repair Shop'', separated by commas>'
       shop/music:
         # shop=music
         name: Music Store
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3605d8f6f..5695782a6 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -18054,6 +18054,34 @@
             },
             "name": "Money Lender"
         },
+        "shop/motorcycle_repair": {
+            "icon": "scooter",
+            "fields": [
+                "name",
+                "operator",
+                "address",
+                "building_area",
+                "service/vehicle",
+                "opening_hours",
+                "payment_multi"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "auto",
+                "bike",
+                "garage",
+                "motorcycle",
+                "repair",
+                "service"
+            ],
+            "tags": {
+                "shop": "motorcycle_repair"
+            },
+            "name": "Motorcycle Repair Shop"
+        },
         "shop/motorcycle": {
             "icon": "scooter",
             "fields": [
diff --git a/data/presets/presets/shop/motorcycle_repair.json b/data/presets/presets/shop/motorcycle_repair.json
index 571036606..3fb1c0619 100644
--- a/data/presets/presets/shop/motorcycle_repair.json
+++ b/data/presets/presets/shop/motorcycle_repair.json
@@ -15,11 +15,11 @@
     ],
     "terms": [
         "auto",
-        "garage",
-        "service",
-        "motorcycle"
         "bike",
-        "bike repair"
+        "garage",
+        "motorcycle",
+        "repair",
+        "service"
     ],
     "tags": {
         "shop": "motorcycle_repair"
diff --git a/data/taginfo.json b/data/taginfo.json
index c31bc8f93..3b7c00948 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -7188,6 +7188,16 @@
             ],
             "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bank-15.svg?sanitize=true"
         },
+        {
+            "key": "shop",
+            "value": "motorcycle_repair",
+            "description": "Motorcycle Repair Shop",
+            "object_types": [
+                "node",
+                "area"
+            ],
+            "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/scooter-15.svg?sanitize=true"
+        },
         {
             "key": "shop",
             "value": "motorcycle",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f7bc2a5ee..98d87e9b9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -6079,6 +6079,10 @@
                     "name": "Money Lender",
                     "terms": ""
                 },
+                "shop/motorcycle_repair": {
+                    "name": "Motorcycle Repair Shop",
+                    "terms": "auto,bike,garage,motorcycle,repair,service"
+                },
                 "shop/motorcycle": {
                     "name": "Motorcycle Dealership",
                     "terms": "bike"