diff -r b65bfa841446 -r 72ca5671f3e6 langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties	Wed May 25 19:30:55 2016 +0530
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n.properties	Wed May 25 11:33:56 2016 -0400
@@ -164,3 +164,12 @@
 err.missing.arg=value missing for {0}
 err.no.classes.specified=no classes specified
 err.unknown.option=unknown option: {0}
+
+#
+# miscellaneous strings
+#
+javah.misc.Deprecation=\
+    \nWarning:\u0020The javah tool is planned to be removed in the next major\n\
+    JDK release. The tool has been superseded by the ''-h'' option added\n\
+    to javac in JDK 8. Users are recommended to migrate to using the\n\
+    javac ''-h'' option; see the javac man page for more information.\n