--- a/jdk/src/java.base/share/native/libjava/System.c	Thu May 28 10:00:51 2015 -0700
+++ b/jdk/src/java.base/share/native/libjava/System.c	Thu May 28 11:31:40 2015 -0700
@@ -111,7 +111,7 @@
 #ifndef VENDOR /* Third party may overwrite this. */
 #define VENDOR "Oracle Corporation"
 #define VENDOR_URL "http://java.oracle.com/"
-#define VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/"
+#define VENDOR_URL_BUG "http://bugreport.java.com/bugreport/"
 #endif
 
 #define JAVA_MAX_SUPPORTED_VERSION 52

--- a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties	Thu May 28 10:00:51 2015 -0700
+++ b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties	Thu May 28 11:31:40 2015 -0700
@@ -498,9 +498,9 @@
 javac.err.cant.write=\
 	Can''t write: {0}
 javac.err.fatal.error=\
-	An error has occurred in the compiler; please file a bug report (http://bugreport.sun.com/bugreport/).
+	An error has occurred in the compiler; please file a bug report (http://bugreport.java.com/bugreport/).
 javac.err.fatal.exception=\
-	An exception has occurred in the compiler; please file a bug report (http://bugreport.sun.com/bugreport/).
+	An exception has occurred in the compiler; please file a bug report (http://bugreport.java.com/bugreport/).
 javac.err.no.inner.classes=\
 	Support for inner classes has been disabled.
 javac.err.uncaught.exception=\