--- old/src/share/vm/runtime/arguments.cpp	2016-01-28 14:14:19.080801744 -0500
+++ new/src/share/vm/runtime/arguments.cpp	2016-01-28 14:14:18.795524493 -0500
@@ -401,10 +401,12 @@
 };
 
 static AliasedLoggingFlag const aliased_logging_flags[] = {
-  { "TraceClassResolution", LogLevel::Info, true, LogTag::_classresolve },
-  { "TraceExceptions", LogLevel::Info, true, LogTag::_exceptions },
-  { "TraceMonitorInflation", LogLevel::Debug, true, LogTag::_monitorinflation },
-  { NULL, LogLevel::Off, false, LogTag::__NO_TAG }
+  { "TraceClassLoading",     	 LogLevel::Info,  true,  LogTag::_classload },
+  { "TraceClassUnloading",       LogLevel::Info,  true,  LogTag::_classunload },
+  { "TraceClassResolution",      LogLevel::Info,  true,  LogTag::_classresolve },
+  { "TraceExceptions",           LogLevel::Info,  true,  LogTag::_exceptions },
+  { "TraceMonitorInflation",     LogLevel::Debug, true,  LogTag::_monitorinflation },
+  { NULL,                        LogLevel::Off,   false, LogTag::__NO_TAG }
 };
 
 // Return true if "v" is less than "other", where "other" may be "undefined".
@@ -2652,12 +2654,8 @@
     // -verbose:[class/gc/jni]
     if (match_option(option, "-verbose", &tail)) {
       if (!strcmp(tail, ":class") || !strcmp(tail, "")) {
-        if (FLAG_SET_CMDLINE(bool, TraceClassLoading, true) != Flag::SUCCESS) {
-          return JNI_EINVAL;
-        }
-        if (FLAG_SET_CMDLINE(bool, TraceClassUnloading, true) != Flag::SUCCESS) {
-          return JNI_EINVAL;
-        }
+        LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(classload));
+        LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(classunload));
       } else if (!strcmp(tail, ":gc")) {
         LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(gc));
       } else if (!strcmp(tail, ":jni")) {