diff --git a/data/presets/amenity/baking_oven.json b/data/presets/amenity/baking_oven.json
new file mode 100644
index 00000000..4677ddfb
--- /dev/null
+++ b/data/presets/amenity/baking_oven.json
@@ -0,0 +1,28 @@
+{
+    "icon": "temaki-bread",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "baking_oven"
+    },
+    "fields": [
+        "covered",
+        "access_simple"
+    ],
+    "moreFields": [
+        "lit"
+    ],
+    "terms": [
+        "bakehouse",
+        "beehive oven",
+        "bread",
+        "clay oven",
+        "horno",
+        "masonry oven",
+        "tabun oven",
+        "pizza oven"
+    ],
+    "name": "Baking Oven"
+}
diff --git a/data/presets/building/bakehouse.json b/data/presets/building/bakehouse.json
new file mode 100644
index 00000000..71814057
--- /dev/null
+++ b/data/presets/building/bakehouse.json
@@ -0,0 +1,11 @@
+{
+    "icon": "temaki-bread",
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "bakehouse"
+    },
+    "matchScore": 0.5,
+    "name": "Bakehouse"
+}
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index f20ccf64..5a0df482 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -6068,6 +6068,11 @@ en:
         name: ATM
         # 'terms: money,cash,machine'
         terms: <translate with synonyms or related terms for 'ATM', separated by commas>
+      amenity/baking_oven:
+        # amenity=baking_oven | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Baking Oven
+        # 'terms: bakehouse,beehive oven,bread,clay oven,horno,masonry oven,tabun oven,pizza oven'
+        terms: <translate with synonyms or related terms for 'Baking Oven', separated by commas>
       amenity/bank:
         # amenity=bank | Credit Union | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Bank
@@ -7776,6 +7781,10 @@ en:
         # building=apartments | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Apartment Building
         terms: <translate with synonyms or related terms for 'Apartment Building', separated by commas>
+      building/bakehouse:
+        # building=bakehouse | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Bakehouse
+        terms: <translate with synonyms or related terms for 'Bakehouse', separated by commas>
       building/barn:
         # building=barn | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Barn