diff --git a/docs/changelog.txt b/docs/changelog.txt
index 727980577..745cf97fe 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -49,6 +49,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `remove-stress`: fixed an error when running on soul-less units (e.g. with ``-all``)
 - `revflood`: stopped revealing tiles adjacent to tiles above open space inappropriately
 - `dig`: Fix "Inappropriate dig square" announcements if digging job has been posted
+- `stockpiles`: ``loadstock`` sets usable and unusable weapon and armor settings
 
 ## Misc Improvements
 - Added script name to messages produced by ``qerror()`` in Lua scripts
diff --git a/plugins/stockpiles/StockpileSerializer.cpp b/plugins/stockpiles/StockpileSerializer.cpp
index 80e438701..ef8c557c3 100644
--- a/plugins/stockpiles/StockpileSerializer.cpp
+++ b/plugins/stockpiles/StockpileSerializer.cpp
@@ -1964,6 +1964,8 @@ void StockpileSerializer::read_weapons()
         bool usable = weapons.usable();
         debug() <<  "unusable " <<  unusable <<  endl;
         debug() <<  "usable " <<  usable <<  endl;
+        mPile->settings.weapons.unusable = unusable;
+        mPile->settings.weapons.usable = usable;
 
         // weapon type
         unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&
@@ -2127,6 +2129,8 @@ void StockpileSerializer::read_armor()
         bool usable = armor.usable();
         debug() <<  "unusable " <<  unusable <<  endl;
         debug() <<  "usable " <<  usable <<  endl;
+        mPile->settings.armor.unusable = unusable;
+        mPile->settings.armor.usable = usable;
 
         // body type
         unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&