--- old/src/share/vm/classfile/javaClasses.cpp	2016-01-17 16:49:46.912618948 +0100
+++ new/src/share/vm/classfile/javaClasses.cpp	2016-01-17 16:49:46.851620001 +0100
@@ -3516,6 +3516,7 @@
 int java_lang_ref_Reference::static_lock_offset;
 int java_lang_ref_Reference::static_pending_offset;
 int java_lang_ref_Reference::number_of_fake_oop_fields;
+int java_lang_ref_Ephemeron::value_offset;
 int java_lang_ref_SoftReference::timestamp_offset;
 int java_lang_ref_SoftReference::static_clock_offset;
 int java_lang_ClassLoader::parent_offset;
@@ -3691,7 +3692,10 @@
   // The first field is for the discovered field added in 1.4
   java_lang_ref_Reference::number_of_fake_oop_fields = 1;
 
-  // java_lang_ref_SoftReference Class
+  // java_lang_ref_Ephemeron Class
+  java_lang_ref_Ephemeron::value_offset = java_lang_ref_Ephemeron::hc_value_offset * x + header;
+
+    // java_lang_ref_SoftReference Class
   java_lang_ref_SoftReference::timestamp_offset = align_size_up((java_lang_ref_SoftReference::hc_timestamp_offset * x + header), BytesPerLong);
   // Don't multiply static fields because they are always in wordSize units
   java_lang_ref_SoftReference::static_clock_offset = java_lang_ref_SoftReference::hc_static_clock_offset * x;