diff --git a/data/presets.yaml b/data/presets.yaml
index e4499fb73..ef55d4049 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1435,6 +1435,21 @@ en:
       amenity:
         # amenity=*
         name: Amenity
+      amenity/animal_boarding:
+        # amenity=animal_boarding
+        name: Animal Boarding Facility
+        # 'terms: boarding,cat,dog,horse,kitten,pet boarding,pet care,pet hotel,puppy,reptile'
+        terms: '<translate with synonyms or related terms for ''Animal Boarding Facility'', separated by commas>'
+      amenity/animal_breeding:
+        # amenity=animal_breeding
+        name: Animal Breeding Facility
+        # 'terms: breeding,bull,cat,cow,dog,horse,husbandry,kitten,livestock,pet breeding,puppy,reptile'
+        terms: '<translate with synonyms or related terms for ''Animal Breeding Facility'', separated by commas>'
+      amenity/animal_shelter:
+        # amenity=animal_shelter
+        name: Animal Shelter
+        # 'terms: adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,puppy,raptor,reptile,rescue,spca'
+        terms: '<translate with synonyms or related terms for ''Animal Shelter'', separated by commas>'
       amenity/arts_centre:
         # amenity=arts_centre
         name: Arts Center
@@ -4043,7 +4058,7 @@ en:
       shop/pet:
         # shop=pet
         name: Pet Store
-        # 'terms: cat,dog,fish'
+        # 'terms: animal,cat,dog,fish,kitten,puppy,reptile'
         terms: '<translate with synonyms or related terms for ''Pet Store'', separated by commas>'
       shop/photo:
         # shop=photo
diff --git a/data/presets/presets.json b/data/presets/presets.json
index f6c82278c..d96b4cbd2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -564,6 +564,98 @@
             "name": "Swimming Pool",
             "searchable": false
         },
+        "amenity/animal_boarding": {
+            "icon": "veterinary",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "boarding",
+                "cat",
+                "dog",
+                "horse",
+                "kitten",
+                "pet boarding",
+                "pet care",
+                "pet hotel",
+                "puppy",
+                "reptile"
+            ],
+            "tags": {
+                "amenity": "animal_boarding"
+            },
+            "name": "Animal Boarding Facility"
+        },
+        "amenity/animal_breeding": {
+            "icon": "veterinary",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "breeding",
+                "bull",
+                "cat",
+                "cow",
+                "dog",
+                "horse",
+                "husbandry",
+                "kitten",
+                "livestock",
+                "pet breeding",
+                "puppy",
+                "reptile"
+            ],
+            "tags": {
+                "amenity": "animal_breeding"
+            },
+            "name": "Animal Breeding Facility"
+        },
+        "amenity/animal_shelter": {
+            "icon": "veterinary",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "adoption",
+                "aspca",
+                "cat",
+                "dog",
+                "horse",
+                "kitten",
+                "pet care",
+                "pet rescue",
+                "puppy",
+                "raptor",
+                "reptile",
+                "rescue",
+                "spca"
+            ],
+            "tags": {
+                "amenity": "animal_shelter"
+            },
+            "name": "Animal Shelter"
+        },
         "amenity/arts_centre": {
             "icon": "theatre",
             "fields": [
@@ -11344,9 +11436,13 @@
                 "area"
             ],
             "terms": [
+                "animal",
                 "cat",
                 "dog",
-                "fish"
+                "fish",
+                "kitten",
+                "puppy",
+                "reptile"
             ],
             "tags": {
                 "shop": "pet"
diff --git a/data/presets/presets/amenity/animal_boarding.json b/data/presets/presets/amenity/animal_boarding.json
new file mode 100644
index 000000000..f0832a8eb
--- /dev/null
+++ b/data/presets/presets/amenity/animal_boarding.json
@@ -0,0 +1,29 @@
+{
+    "icon": "veterinary",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "boarding",
+        "cat",
+        "dog",
+        "horse",
+        "kitten",
+        "pet boarding",
+        "pet care",
+        "pet hotel",
+        "puppy",
+        "reptile"
+    ],
+    "tags": {
+        "amenity": "animal_boarding"
+    },
+    "name": "Animal Boarding Facility"
+}
diff --git a/data/presets/presets/amenity/animal_breeding.json b/data/presets/presets/amenity/animal_breeding.json
new file mode 100644
index 000000000..ddcdec17b
--- /dev/null
+++ b/data/presets/presets/amenity/animal_breeding.json
@@ -0,0 +1,31 @@
+{
+    "icon": "veterinary",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "breeding",
+        "bull",
+        "cat",
+        "cow",
+        "dog",
+        "horse",
+        "husbandry",
+        "kitten",
+        "livestock",
+        "pet breeding",
+        "puppy",
+        "reptile"
+    ],
+    "tags": {
+        "amenity": "animal_breeding"
+    },
+    "name": "Animal Breeding Facility"
+}
diff --git a/data/presets/presets/amenity/animal_shelter.json b/data/presets/presets/amenity/animal_shelter.json
new file mode 100644
index 000000000..0212e60f8
--- /dev/null
+++ b/data/presets/presets/amenity/animal_shelter.json
@@ -0,0 +1,32 @@
+{
+    "icon": "veterinary",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "adoption",
+        "aspca",
+        "cat",
+        "dog",
+        "horse",
+        "kitten",
+        "pet care",
+        "pet rescue",
+        "puppy",
+        "raptor",
+        "reptile",
+        "rescue",
+        "spca"
+    ],
+    "tags": {
+        "amenity": "animal_shelter"
+    },
+    "name": "Animal Shelter"
+}
diff --git a/data/presets/presets/shop/pet.json b/data/presets/presets/shop/pet.json
index ee048d82e..4091f5d2a 100644
--- a/data/presets/presets/shop/pet.json
+++ b/data/presets/presets/shop/pet.json
@@ -11,9 +11,13 @@
         "area"
     ],
     "terms": [
+        "animal",
         "cat",
         "dog",
-        "fish"
+        "fish",
+        "kitten",
+        "puppy",
+        "reptile"
     ],
     "tags": {
         "shop": "pet"
diff --git a/data/taginfo.json b/data/taginfo.json
index fa7e5f33d..92890ac01 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -143,6 +143,18 @@
             "key": "amenity",
             "value": "swimming_pool"
         },
+        {
+            "key": "amenity",
+            "value": "animal_boarding"
+        },
+        {
+            "key": "amenity",
+            "value": "animal_breeding"
+        },
+        {
+            "key": "amenity",
+            "value": "animal_shelter"
+        },
         {
             "key": "amenity",
             "value": "arts_centre"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e3e9f877d..c5ec1eed9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2000,6 +2000,18 @@
                     "name": "Swimming Pool",
                     "terms": ""
                 },
+                "amenity/animal_boarding": {
+                    "name": "Animal Boarding Facility",
+                    "terms": "boarding,cat,dog,horse,kitten,pet boarding,pet care,pet hotel,puppy,reptile"
+                },
+                "amenity/animal_breeding": {
+                    "name": "Animal Breeding Facility",
+                    "terms": "breeding,bull,cat,cow,dog,horse,husbandry,kitten,livestock,pet breeding,puppy,reptile"
+                },
+                "amenity/animal_shelter": {
+                    "name": "Animal Shelter",
+                    "terms": "adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,puppy,raptor,reptile,rescue,spca"
+                },
                 "amenity/arts_centre": {
                     "name": "Arts Center",
                     "terms": ""
@@ -4334,7 +4346,7 @@
                 },
                 "shop/pet": {
                     "name": "Pet Store",
-                    "terms": "cat,dog,fish"
+                    "terms": "animal,cat,dog,fish,kitten,puppy,reptile"
                 },
                 "shop/photo": {
                     "name": "Photography Store",