diff --git a/docs/changelog.txt b/docs/changelog.txt
index d12ed37aa..6e669c893 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -40,6 +40,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Fix extra keys appearing in DFHack text boxes when shift (or any other modifier) is released before the other key you were pressing
 
 ## Misc Improvements
+- `stockpiles`: include exotic pets in the "tameable" filter
 - `autonick`: add more variety to nicknames based on famous literary dwarves
 - ``widgets.EditField``: DFHack edit fields now support cut/copy/paste with the system clipboard with Ctrl-X/Ctrl-C/Ctrl-V
 - Suppress DF keyboard events when a DFHack keybinding is matched. This prevents, for example, a backtick from appearing in a textbox as text when you launch `gui/launcher` from the backtick keybinding.
diff --git a/plugins/stockpiles/StockpileSerializer.cpp b/plugins/stockpiles/StockpileSerializer.cpp
index 4e2806e22..536ad3e4e 100644
--- a/plugins/stockpiles/StockpileSerializer.cpp
+++ b/plugins/stockpiles/StockpileSerializer.cpp
@@ -615,7 +615,9 @@ static bool serialize_list_creature(color_ostream& out, FuncWriteExport add_valu
 }
 
 static string get_filter_string(df::creature_raw *r) {
-    if (!r->caste.size() || !r->caste[0]->flags.is_set(df::enums::caste_raw_flags::PET))
+    if (!r->caste.size() ||
+            (!r->caste[0]->flags.is_set(df::enums::caste_raw_flags::PET) &&
+             !r->caste[0]->flags.is_set(df::enums::caste_raw_flags::PET_EXOTIC)))
         return r->name[0];
     return r->name[0] + "/tameable";
 }