diff --git a/apps/openmw/mwlua/types/container.cpp b/apps/openmw/mwlua/types/container.cpp
index 5dc7e70e6c..729363435b 100644
--- a/apps/openmw/mwlua/types/container.cpp
+++ b/apps/openmw/mwlua/types/container.cpp
@@ -3,12 +3,16 @@
 #include <components/esm3/loadcont.hpp>
 
 #include <apps/openmw/mwworld/esmstore.hpp>
-
-//#include "../mwworld/class.hpp"
-#include "apps/openmw/mwworld/class.hpp"
+#include <apps/openmw/mwworld/class.hpp>
 
 #include "../luabindings.hpp"
 
+namespace sol
+{
+    template <>
+    struct is_automagical<ESM::Container> : std::false_type {};
+}
+
 namespace MWLua
 {
 
diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua
index b77c3ec054..be022b4ef2 100644
--- a/files/lua_api/openmw/types.lua
+++ b/files/lua_api/openmw/types.lua
@@ -869,7 +869,31 @@
 -- @param openmw.core#GameObject object
 -- @return #boolean
 
+---
+-- Returns the total weight of everything in a container
+-- @function [parent=#Container] encumbrance
+-- @param openmw.core#GameObject object
+-- @return #number
 
+---
+-- Returns the capacity of a container
+-- @function [parent=#Container] capacity
+-- @param openmw.core#GameObject object
+-- @return #number
+
+---
+-- Returns the read-only @{#ContainerRecord} of a container
+-- @function [parent=#Container] record
+-- @param #any objectOrRecordId
+-- @return #ContainerRecord
+
+---
+-- @type ContainerRecord
+-- @field #string id Record id
+-- @field #string name Human-readable name
+-- @field #string model VFS path to the model
+-- @field #string mwscript MWScript on this container (can be empty)
+-- @field #number weight capacity of this container (can be empty)
 
 --- @{#Door} functions
 -- @field [parent=#types] #Door Door