--- a/hotspot/src/share/vm/services/classLoadingService.cpp	Fri Apr 29 18:55:41 2016 +0000
+++ b/hotspot/src/share/vm/services/classLoadingService.cpp	Fri Apr 29 22:40:51 2016 -0400
@@ -138,9 +138,9 @@
     }
   }
 
-  if (log_is_enabled(Info, classunload)) {
+  if (log_is_enabled(Info, class, unload)) {
     ResourceMark rm;
-    log_info(classunload)("unloading class %s " INTPTR_FORMAT , k->external_name(), p2i(k));
+    log_info(class, unload)("unloading class %s " INTPTR_FORMAT , k->external_name(), p2i(k));
   }
 }
 
@@ -184,9 +184,9 @@
   MutexLocker m(Management_lock);
   // verbose will be set to the previous value
   if (verbose) {
-    LogConfiguration::parse_log_arguments("stdout", "classload=info", NULL, NULL, NULL);
+    LogConfiguration::parse_log_arguments("stdout", "class+load=info", NULL, NULL, NULL);
   } else {
-    LogConfiguration::parse_log_arguments("stdout", "classload=off", NULL, NULL, NULL);
+    LogConfiguration::parse_log_arguments("stdout", "class+load=off", NULL, NULL, NULL);
   }
   reset_trace_class_unloading();
   return verbose;
@@ -197,9 +197,9 @@
   assert(Management_lock->owned_by_self(), "Must own the Management_lock");
   bool value = MemoryService::get_verbose() || ClassLoadingService::get_verbose();
   if (value) {
-    LogConfiguration::parse_log_arguments("stdout", "classunload=info", NULL, NULL, NULL);
+    LogConfiguration::parse_log_arguments("stdout", "class+unload=info", NULL, NULL, NULL);
   } else {
-    LogConfiguration::parse_log_arguments("stdout", "classunload=off", NULL, NULL, NULL);
+    LogConfiguration::parse_log_arguments("stdout", "class+unload=off", NULL, NULL, NULL);
   }
 }