diff --git a/gluon/gluon-core/files/usr/lib/lua/gluon/site_config.lua b/gluon/gluon-core/files/usr/lib/lua/gluon/site_config.lua
index 0735cd0..cf15148 100644
--- a/gluon/gluon-core/files/usr/lib/lua/gluon/site_config.lua
+++ b/gluon/gluon-core/files/usr/lib/lua/gluon/site_config.lua
@@ -6,4 +6,16 @@ local function loader()
 end
 
 -- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
-return setfenv(assert(load(coroutine.wrap(loader), 'site.conf')), {})()
+local site_config = setfenv(assert(load(coroutine.wrap(loader), 'site.conf')), {})()
+
+local setmetatable = setmetatable
+
+module 'gluon.site_config'
+
+setmetatable(_M,
+	{
+		__index = site_config,
+	}
+)
+
+return _M
diff --git a/gluon/gluon-core/files/usr/lib/lua/gluon/sysconfig.lua b/gluon/gluon-core/files/usr/lib/lua/gluon/sysconfig.lua
index 7088249..35c5062 100644
--- a/gluon/gluon-core/files/usr/lib/lua/gluon/sysconfig.lua
+++ b/gluon/gluon-core/files/usr/lib/lua/gluon/sysconfig.lua
@@ -17,11 +17,15 @@ local function set(_, name, val)
 	f:close()
 end
 
-local sysconfig = {}
-local mt = {
-	__index = get,
-	__newindex = set,
-}
+local setmetatable = setmetatable
 
-setmetatable(sysconfig, mt)
-return sysconfig
+module 'gluon.sysconfig'
+
+setmetatable(_M,
+	{
+		__index = get,
+		__newindex = set,
+	}
+)
+
+return _M