diff --git a/java/jni/elf-loader.cc b/java/jni/elf-loader.cc
index 88f03d53ef8fb0aa0e565c5fbaf4641f470263b5..47cd2b84b84525d154a0100ba3da0e0eb19b800d 100644
--- a/java/jni/elf-loader.cc
+++ b/java/jni/elf-loader.cc
@@ -1,4 +1,6 @@
 //#include <algorithm>
+#include "debug.hh"
+#include "sched.hh"
 #include "elf.hh"
 #include <jni.h>
 #include <stdlib.h>
@@ -22,6 +24,8 @@ bool run_elf(int argc, char** argv, int *return_code)
        return (false);
     }
 
+    debug("run_elf(): running main() in the context of thread %p\n",
+        sched::thread::current());
     int rc = main(argc, argv);
 
     /* cleanups */