--- old/src/share/vm/classfile/systemDictionary.hpp	2016-01-24 11:21:52.455790481 +0100
+++ new/src/share/vm/classfile/systemDictionary.hpp	2016-01-24 11:21:52.373791893 +0100
@@ -126,9 +126,9 @@
   /* Preload ref klasses and set reference types */                                                                      \
   do_klass(SoftReference_klass,                         java_lang_ref_SoftReference,               Pre                 ) \
   do_klass(WeakReference_klass,                         java_lang_ref_WeakReference,               Pre                 ) \
+  do_klass(Ephemeron_klass,                             java_lang_ref_Ephemeron,                   Pre                 ) \
   do_klass(FinalReference_klass,                        java_lang_ref_FinalReference,              Pre                 ) \
   do_klass(PhantomReference_klass,                      java_lang_ref_PhantomReference,            Pre                 ) \
-  do_klass(Cleaner_klass,                               sun_misc_Cleaner,                          Pre                 ) \
   do_klass(Finalizer_klass,                             java_lang_ref_Finalizer,                   Pre                 ) \
                                                                                                                          \
   do_klass(Thread_klass,                                java_lang_Thread,                          Pre                 ) \