--- a/jdk/src/java.desktop/share/classes/sun/applet/Main.java	Fri Jan 22 13:37:46 2016 +0300
+++ b/jdk/src/java.desktop/share/classes/sun/applet/Main.java	Fri Jan 22 15:46:24 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -107,6 +107,7 @@
     private int run(String [] args) {
         // DECODE ARGS
         try {
+            System.out.println(lookup("deprecated"));
             if (args.length == 0) {
                 usage();
                 return 0;

--- a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java	Fri Jan 22 13:37:46 2016 +0300
+++ b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java	Fri Jan 22 15:46:24 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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
@@ -73,6 +73,7 @@
             {"appletviewer.parse.warning.embed.requiresheight", "Warning: <embed> tag requires height attribute."},
             {"appletviewer.parse.warning.embed.requireswidth", "Warning: <embed> tag requires width attribute."},
             {"appletviewer.parse.warning.appnotLongersupported", "Warning: <app> tag no longer supported, use <applet> instead:"},
+            {"appletviewer.deprecated", "AppletViewer is deprecated."},
             {"appletviewer.usage", "Usage: appletviewer <options> url(s)\n\nwhere <options> include:\n  -debug                  Start the applet viewer in the Java debugger\n  -encoding <encoding>    Specify character encoding used by HTML files\n  -J<runtime flag>        Pass argument to the java interpreter\n\nThe -J option is non-standard and subject to change without notice."},
             {"appletviewer.main.err.unsupportedopt", "Unsupported option: {0}"},
             {"appletviewer.main.err.unrecognizedarg", "Unrecognized argument: {0}"},

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java	Fri Jan 22 15:46:24 2016 +0300
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016, 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.
+ *
+ * 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.
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+/**
+ * @test
+ * @bug 8074165
+ * @modules java.desktop/sun.applet
+ * @run main/othervm -Duser.language=en DeprecatedAppletViewer
+ */
+public final class DeprecatedAppletViewer {
+
+    private static final String TEXT = "AppletViewer is deprecated.";
+
+    public static void main(final String[] args) {
+        final PrintStream old = System.out;
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
+        final PrintStream ps = new PrintStream(baos);
+        try {
+            System.setOut(ps);
+            sun.applet.Main.main(new String[]{});
+        } finally {
+            System.setOut(old);
+        }
+
+        final String text = new String(baos.toByteArray());
+        if (!text.contains(TEXT)) {
+            System.err.println("The text should contain: \"" + TEXT + "\"");
+            System.err.println("But the current text is: ");
+            System.err.println(text);
+            throw new RuntimeException("Error");
+        }
+    }
+}