diff --git a/docs/changelog.txt b/docs/changelog.txt
index d2404c951..ba75f09fb 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:
 # Future
 
 ## Fixes
+- `autogems`: fixed an issue with binned gems being ignored in linked stockpiles
 - `tweak` embark-profile-name: fixed handling of the native shift+space key
 
 ## Misc Improvements
diff --git a/plugins/autogems.cpp b/plugins/autogems.cpp
index 4121b562f..f22d20d30 100644
--- a/plugins/autogems.cpp
+++ b/plugins/autogems.cpp
@@ -167,6 +167,16 @@ void create_jobs() {
                         stockpiled.insert(item->id);
                         piled[item->getMaterialIndex()] += 1;
                     }
+                    else if (item->flags.bits.container) {
+                        std::vector<df::item*> binneditems;
+                        Items::getContainedItems(item, &binneditems);
+                        for (df::item *it : binneditems) {
+                            if (valid_gem(it)) {
+                                stockpiled.insert(it->id);
+                                piled[it->getMaterialIndex()] += 1;
+                            }
+                        }
+                    }
                 }
 
                 // Decrement current jobs from all linked workshops, not just this one.