diff --git a/jdk/src/java.base/share/native/libjava/System.c b/jdk/src/java.base/share/native/libjava/System.c
index d09af8ff78a..01d6e59cccd 100644
--- a/jdk/src/java.base/share/native/libjava/System.c
+++ b/jdk/src/java.base/share/native/libjava/System.c
@@ -111,7 +111,7 @@ Java_java_lang_System_identityHashCode(JNIEnv *env, jobject this, jobject x)
 #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
diff --git a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties
index f5ce0f8deef..2caf03fd1ea 100644
--- a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties
+++ b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties
@@ -498,9 +498,9 @@ javac.err.cant.read=\
 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=\