--- /dev/null	2018-07-05 16:03:01.952496000 +0100
+++ new/src/jdk.jfr/share/classes/jdk/jfr/events/X509CertEvent.java	2018-07-10 13:46:32.274516592 +0100
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.events;
+
+import jdk.jfr.*;
+import jdk.jfr.internal.MirrorEvent;
+
+@Category({"Java Development Kit", "Security"})
+@Label("X509 Certificate")
+@Name("jdk.X509Certificate")
+@Description("Details of X.509 Certificate parsed by JDK")
+@MirrorEvent(className = "jdk.internal.event.X509CertEvent")
+public final class X509CertEvent extends AbstractJDKEvent {
+    @Label("Signature Algorithm")
+    public String algorithm;
+
+    @Label("Serial Number")
+    public String serialNumber;
+
+    @Label("Subject")
+    public String subject;
+
+    @Label("Issuer")
+    public String issuer;
+
+    @Label("Key Type")
+    public String keyType;
+
+    @Label("Key Length")
+    public int length;
+
+    @Label("Valid From")
+    @Timestamp(Timestamp.MILLISECONDS_SINCE_EPOCH)
+    public long validFrom;
+
+    @Label("Valid Until")
+    @Timestamp(Timestamp.MILLISECONDS_SINCE_EPOCH)
+    public long validUntil;
+}