--- old/make/pack/pack.all.properties	Fri Mar 15 16:30:30 2013
+++ new/make/pack/pack.all.properties	Fri Mar 15 16:30:30 2013
@@ -8,16 +8,15 @@
 pack.modification.time=keep
 pack.keep.class.order=true
 pack.deflate.hint=false
-#Fail the build, if new or unknown attributes are introduced.
-#Note:Any new attributes must be added into instrinsic.properties
-pack.unknown.attribute=error
+pack.unknown.attribute=pass
 pack.segment.limit=-1
-#BugId: 6328502,  These files will be passed-through as-is.
-pack.pass.file.0=java/lang/Error.class
-pack.pass.file.1=java/lang/LinkageError.class
-pack.pass.file.2=java/lang/Object.class
-pack.pass.file.3=java/lang/Throwable.class
-pack.pass.file.4=java/lang/VerifyError.class
-pack.pass.file.5=com/sun/demo/jvmti/hprof/Tracker.class
-# disable until 8003549 is fixed
-pack.effort=0
+# pass the following attributes as-is for now, there should not
+# be any in the current version of the JDK
+pack.class.attribute.RuntimeVisibleTypeAnnotations=pass
+pack.field.attribute.RuntimeVisibleTypeAnnotations=pass
+pack.method.attribute.RuntimeVisibleTypeAnnotations=pass
+pack.code.attribute.RuntimeVisibleTypeAnnotations=pass
+pack.class.attribute.RuntimeInvisibleTypeAnnotations=pass
+pack.field.attribute.RuntimeInvisibleTypeAnnotations=pass
+pack.method.attribute.RuntimeInvisibleTypeAnnotations=pass
+pack.code.attribute.RuntimeInvisibleTypeAnnotations=pass