diff --git a/data/presets.yaml b/data/presets.yaml
index a5bfe6f1d..1f917d10c 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3220,6 +3220,10 @@ en:
         # shop=clothes
         name: Clothing Store
         terms: "<translate with synonyms or related terms for 'Clothing Store', separated by commas>"
+      shop/coffee:
+        # shop=coffee
+        name: Coffee Store
+        terms: "<translate with synonyms or related terms for 'Coffee Store', separated by commas>"
       shop/computer:
         # shop=computer
         name: Computer Store
diff --git a/data/presets/presets.json b/data/presets/presets.json
index beba54f2e..e445d2503 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -8260,6 +8260,23 @@
         },
         "name": "Clothing Store"
     },
+    "shop/coffee": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "coffee"
+        },
+        "name": "Coffee Store"
+    },
     "shop/computer": {
         "icon": "shop",
         "fields": [
diff --git a/data/presets/presets/shop/coffee.json b/data/presets/presets/shop/coffee.json
new file mode 100644
index 000000000..c89096142
--- /dev/null
+++ b/data/presets/presets/shop/coffee.json
@@ -0,0 +1,17 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "coffee"
+    },
+    "name": "Coffee Store"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index f2108ab64..978bb0d12 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1931,6 +1931,10 @@
             "key": "shop",
             "value": "clothes"
         },
+        {
+            "key": "shop",
+            "value": "coffee"
+        },
         {
             "key": "shop",
             "value": "computer"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 394af054c..ec088ad3d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3490,6 +3490,10 @@
                 "name": "Clothing Store",
                 "terms": ""
             },
+            "shop/coffee": {
+                "name": "Coffee Store",
+                "terms": ""
+            },
             "shop/computer": {
                 "name": "Computer Store",
                 "terms": ""