diff --git a/src/share/classes/sun/tools/jar/CommandLine.java b/src/share/classes/sun/tools/jar/CommandLine.java
index bf53dd3ffd7155c1d98e807bf1fb4aa121a1dd22..acb13082f7bb5ff80102b97baf6c5aa161e5beee 100644
--- a/src/share/classes/sun/tools/jar/CommandLine.java
+++ b/src/share/classes/sun/tools/jar/CommandLine.java
@@ -36,7 +36,7 @@ import java.util.ArrayList;
 /**
  * Various utility methods for processing Java tool command line arguments.
  *
- *  <p><b>This is NOT part of any API suppored by Sun Microsystems.  If
+ *  <p><b>This is NOT part of any API supported by Oracle.  If
  *  you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
diff --git a/test/tools/jar/UpdateManifest.java b/test/tools/jar/UpdateManifest.java
index 2bcd25081ea7238a4ce8f84d87f45d0db88b1fd8..64897183b571df074191c0e40bc9fa1106a17e54 100644
--- a/test/tools/jar/UpdateManifest.java
+++ b/test/tools/jar/UpdateManifest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, 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
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 6434207 6442687
+ * @bug 6434207 6442687 6984046
  * @summary Ensure that jar ufm actually updates the
  * existing jar file's manifest with contents of the
  * manifest file.
@@ -87,7 +87,7 @@ public class UpdateManifest {
         if (!debug) manifestOrig.deleteOnExit();
         PrintWriter pw = new PrintWriter(manifestOrig);
         pw.println("Manifest-Version: 1.0");
-        pw.println("Created-By: 1.6.0-internal (Sun Microsystems Inc.)");
+        pw.println("Created-By: 1.7.0-internal (Oracle Corporation)");
         pw.println("");
         pw.println(animal);
         pw.println(specTitle);
@@ -109,7 +109,7 @@ public class UpdateManifest {
         if (!debug) manifestUpdate.deleteOnExit();
         pw = new PrintWriter(manifestUpdate);
         final String createdBy =
-            "Created-By: 1.5.0-special (Sun Microsystems Inc.)";
+            "Created-By: 1.7.0-special (Oracle Corporation)";
         final String specVersion =
             "Specification-Version: 1.0.0.0";
         pw.println(createdBy); // replaces line in the original