--- old/src/share/vm/classfile/classLoaderData.cpp	2016-10-25 10:40:05.870775340 +0200
+++ new/src/share/vm/classfile/classLoaderData.cpp	2016-10-25 10:40:05.822775308 +0200
@@ -64,6 +64,7 @@
 #include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
+#include "evtrace/traceEvents.hpp"
 #if INCLUDE_TRACE
 #include "trace/tracing.hpp"
 #endif
@@ -306,6 +307,9 @@
   _unloading = true;
 
   // Tell serviceability tools these classes are unloading
+  if (EnableEventTracing) {
+    TraceManager::class_loader_is_unloading(this); // also writes an event
+  }
   classes_do(InstanceKlass::notify_unload_class);
 
   if (TraceClassLoaderData) {