--- old/src/share/vm/classfile/systemDictionary.cpp	2016-01-24 11:21:52.152795697 +0100
+++ new/src/share/vm/classfile/systemDictionary.cpp	2016-01-24 11:21:52.075797023 +0100
@@ -1974,12 +1974,13 @@
   InstanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER);
   InstanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass));
 
-  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Cleaner_klass), scan, CHECK);
+  initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK);
   InstanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT);
   InstanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK);
+  InstanceKlass::cast(WK_KLASS(Ephemeron_klass))->set_reference_type(REF_EPHEMERON);
+  InstanceRefKlass::update_nonstatic_ephemeron_oop_maps(WK_KLASS(Ephemeron_klass));
   InstanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL);
   InstanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM);
-  InstanceKlass::cast(WK_KLASS(Cleaner_klass))->set_reference_type(REF_CLEANER);
 
   // JSR 292 classes
   WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass);