diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index a9def96aa6..82a9212a25 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -176,4 +176,12 @@ namespace MWClass
 
         return info;
     }
+
+    float Container::getCapactiy (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Container, MWWorld::RefData> *ref =
+            ptr.get<ESM::Container>();
+
+        return ref->base->weight;
+    }
 }
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 3b1c8de09a..0231ce26bb 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -36,6 +36,10 @@ namespace MWClass
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
+            virtual float getCapactiy (const MWWorld::Ptr& ptr) const;
+            ///< Return total weight that fits into the object (including modifications from magic
+            /// effects). Throws an exception, if the object can't hold other objects.
+
             static void registerSelf();
     };
 }
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index cf00f361bc..a164554304 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -166,4 +166,10 @@ namespace MWClass
 
         return info;
     }
+
+    float Creature::getCapactiy (const MWWorld::Ptr& ptr) const
+    {
+        const MWMechanics::CreatureStats& stats = getCreatureStats (ptr);
+        return stats.mAttributes[0].getModified()*5;
+    }
 }
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 4a1a8285fd..c68d1995d5 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -52,6 +52,10 @@ namespace MWClass
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
+            virtual float getCapactiy (const MWWorld::Ptr& ptr) const;
+            ///< Return total weight that fits into the object (including modifications from magic
+            /// effects). Throws an exception, if the object can't hold other objects.
+
             static void registerSelf();
     };
 }
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 444fe9965f..3c1c0e29ab 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -325,4 +325,10 @@ namespace MWClass
 
         return info;
     }
+
+    float Npc::getCapactiy (const MWWorld::Ptr& ptr) const
+    {
+        const MWMechanics::CreatureStats& stats = getCreatureStats (ptr);
+        return stats.mAttributes[0].getModified()*5;
+    }
 }
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 38b0ba03f0..d2ecc7aa70 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -74,6 +74,10 @@ namespace MWClass
             ///< Return desired movement vector (determined based on movement settings,
             /// stance and stats).
 
+            virtual float getCapactiy (const MWWorld::Ptr& ptr) const;
+            ///< Return total weight that fits into the object (including modifications from magic
+            /// effects). Throws an exception, if the object can't hold other objects.
+
             static void registerSelf();
     };
 }
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 151d913bed..24d2d07f1b 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -142,6 +142,11 @@ namespace MWWorld
         throw std::logic_error ("value not supported by this class");
     }
 
+    float Class::getCapactiy (const MWWorld::Ptr& ptr) const
+    {
+        throw std::runtime_error ("capacity not supported by class");
+    }
+
     const Class& Class::get (const std::string& key)
     {
         std::map<std::string, boost::shared_ptr<Class> >::const_iterator iter = sClasses.find (key);
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index d7a2d2d759..34e61c54a7 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -164,6 +164,11 @@ namespace MWWorld
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
             /// (default implementation: throws an exception)
 
+            virtual float getCapactiy (const MWWorld::Ptr& ptr) const;
+            ///< Return total weight that fits into the object (including modifications from magic
+            /// effects). Throws an exception, if the object can't hold other objects.
+            /// (default implementation: throws an exception)
+
             static const Class& get (const std::string& key);
             ///< If there is no class for this \a key, an exception is thrown.