2 files changed, 5 insertions, 0 deletions

diff --git a/.luacheckrc b/.luacheckrc
index 19942f9b..e8f7f1a0 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -12,6 +12,9 @@ read_globals = {
 files["prosody"] = {
 	allow_defined_top = true;
 	module = true;
+	globals = {
+		"prosody";
+	}
 }
 files["prosodyctl"] = {
 	allow_defined_top = true;
diff --git a/prosody b/prosody
index dd0374d5..914396c2 100755
--- a/prosody
+++ b/prosody
@@ -54,6 +54,8 @@ local thread = async.runner();
 
 thread:run(startup.prosody);
 
+prosody.main_thread = thread;
+
 local function loop()
 	-- Error handler for errors that make it this far
 	local function catch_uncaught_error(err)