diff --git a/data/presets.yaml b/data/presets.yaml
index 076a2f82c..ede5bef2d 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2280,7 +2280,7 @@ en:
       craft/distillery:
         # craft=distillery
         name: Distillery
-        # 'terms: beer,bier'
+        # 'terms: beer,bier,non-beer,spirits,liquor,hard alcohol,beverage'
         terms: '<translate with synonyms or related terms for ''Distillery'', separated by commas>'
       craft/dressmaker:
         # craft=dressmaker
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3c04fdaf7..894f4e5a6 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4241,7 +4241,7 @@
             "name": "Confectionery"
         },
         "craft/distillery": {
-            "icon": "beer",
+            "icon": "poi-storage-tank",
             "fields": [
                 "operator",
                 "address",
@@ -4254,7 +4254,12 @@
             ],
             "terms": [
                 "beer",
-                "bier"
+                "bier",
+                "non-beer",
+                "spirits",
+                "liquor",
+                "hard alcohol",
+                "beverage"
             ],
             "tags": {
                 "craft": "distillery"
diff --git a/data/presets/presets/craft/distillery.json b/data/presets/presets/craft/distillery.json
index 8b8773499..924083368 100644
--- a/data/presets/presets/craft/distillery.json
+++ b/data/presets/presets/craft/distillery.json
@@ -1,5 +1,5 @@
 {
-    "icon": "beer",
+    "icon": "poi-storage-tank",
     "fields": [
         "operator",
         "address",
@@ -12,7 +12,12 @@
     ],
     "terms": [
         "beer",
-        "bier"
+        "bier",
+        "non-beer",
+        "spirits",
+        "liquor",
+        "hard alcohol",
+        "beverage"
     ],
     "tags": {
         "craft": "distillery"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 105aae5e5..d9ed34fcc 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3037,7 +3037,7 @@
                 },
                 "craft/distillery": {
                     "name": "Distillery",
-                    "terms": "beer,bier"
+                    "terms": "beer,bier,non-beer,spirits,liquor,hard alcohol,beverage"
                 },
                 "craft/dressmaker": {
                     "name": "Dressmaker",