diff --git a/scripts/check_site.lua b/package/gluon-core/luasrc/lib/gluon/check-site.lua
similarity index 97%
rename from scripts/check_site.lua
rename to package/gluon-core/luasrc/lib/gluon/check-site.lua
index 43765f80..6861d8cb 100644
--- a/scripts/check_site.lua
+++ b/package/gluon-core/luasrc/lib/gluon/check-site.lua
@@ -360,7 +360,7 @@ end
 function M.need_domain_name(path)
 	M.need_string(path)
 	M.need(path, function(domain_name)
-		local f = io.open(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/domains/' .. domain_name .. '.json')
+		local f = io.open((os.getenv('IPKG_INSTROOT') or '') .. '/lib/gluon/domains/' .. domain_name .. '.json')
 		if not f then return false end
 		f:close()
 		return true
@@ -383,7 +383,7 @@ end
 
 local check = setfenv(assert(loadfile()), M)
 
-site = assert(json.load(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/site.json'))
+site = assert(json.load((os.getenv('IPKG_INSTROOT') or '') .. '/lib/gluon/site.json'))
 
 local ok, err = pcall(function()
 	if has_domains then
diff --git a/package/gluon.mk b/package/gluon.mk
index 5a794476..a2aab619 100644
--- a/package/gluon.mk
+++ b/package/gluon.mk
@@ -21,7 +21,8 @@ shell-verbatim = $(call shell-unescape,$(call shell-escape,$(1)))
 
 
 define GluonCheckSite
-[ -z "$$IPKG_INSTROOT" ] || "${TOPDIR}/staging_dir/hostpkg/bin/lua" "${TOPDIR}/../scripts/check_site.lua" <<'END__GLUON__CHECK__SITE'
+[ -z "$$STAGING_DIR_HOSTPKG" ] || PATH="$$STAGING_DIR_HOSTPKG/bin:$$PATH"
+lua "$$IPKG_INSTROOT/lib/gluon/check-site.lua" <<'END__GLUON__CHECK__SITE'
 $(call shell-verbatim,cat '$(1)')
 END__GLUON__CHECK__SITE
 endef