diff --git a/core/src/main/java/hudson/ExtensionFinder.java b/core/src/main/java/hudson/ExtensionFinder.java
index 1a61b4d64a6dd01cc759d30f891bac4d705b6a60..a2af086102b216c92209a65cd9fbf667e57fad4c 100644
--- a/core/src/main/java/hudson/ExtensionFinder.java
+++ b/core/src/main/java/hudson/ExtensionFinder.java
@@ -175,7 +175,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
      * from here.
      *
      * <p>
-     * See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6459208 for how to force a class initialization.
+     * See https://bugs.openjdk.java.net/browse/JDK-4993813 for how to force a class initialization.
      * Also see http://kohsuke.org/2010/09/01/deadlock-that-you-cant-avoid/ for how class initialization
      * can results in a dead lock.
      */
@@ -668,8 +668,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
                         extType = ((Method)e).getReturnType();
                     } else
                         throw new AssertionError();
-                    // according to http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6459208
-                    // this appears to be the only way to force a class initialization
+                    // according to JDK-4993813 this is the only way to force class initialization
                     Class.forName(extType.getName(),true,extType.getClassLoader());
                 } catch (Exception | LinkageError e) {
                     LOGGER.log(logLevel(item), "Failed to scout "+item.className(), e);
diff --git a/core/src/main/java/hudson/util/jna/InitializationErrorInvocationHandler.java b/core/src/main/java/hudson/util/jna/InitializationErrorInvocationHandler.java
index 5e6ad17a7f05080e52c70c877f0776f1af046ab8..c23343c15ccd6286132c90d70d639a18deabd5b0 100644
--- a/core/src/main/java/hudson/util/jna/InitializationErrorInvocationHandler.java
+++ b/core/src/main/java/hudson/util/jna/InitializationErrorInvocationHandler.java
@@ -12,7 +12,6 @@ import java.lang.reflect.Proxy;
  *
  * @author Kohsuke Kawaguchi
  * @since 1.487
- * @see <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7199848">Related bug report against JDK</a>
  */
 public class InitializationErrorInvocationHandler implements InvocationHandler {
     private final Throwable cause;