--- old/src/share/vm/runtime/vmStructs.cpp	2016-01-24 11:21:56.352723396 +0100
+++ new/src/share/vm/runtime/vmStructs.cpp	2016-01-24 11:21:56.274724739 +0100
@@ -704,9 +704,9 @@
      static_field(SystemDictionary,            WK_KLASS(Reference_klass),                     InstanceKlass*)                        \
      static_field(SystemDictionary,            WK_KLASS(SoftReference_klass),                 InstanceKlass*)                        \
      static_field(SystemDictionary,            WK_KLASS(WeakReference_klass),                 InstanceKlass*)                        \
+     static_field(SystemDictionary,            WK_KLASS(Ephemeron_klass),                     InstanceKlass*)                        \
      static_field(SystemDictionary,            WK_KLASS(FinalReference_klass),                InstanceKlass*)                        \
      static_field(SystemDictionary,            WK_KLASS(PhantomReference_klass),              InstanceKlass*)                        \
-     static_field(SystemDictionary,            WK_KLASS(Cleaner_klass),                       InstanceKlass*)                        \
      static_field(SystemDictionary,            WK_KLASS(Finalizer_klass),                     InstanceKlass*)                        \
      static_field(SystemDictionary,            WK_KLASS(Thread_klass),                        InstanceKlass*)                        \
      static_field(SystemDictionary,            WK_KLASS(ThreadGroup_klass),                   InstanceKlass*)                        \