diff --git a/mozilla/js/rhino/org/mozilla/javascript/tools/shell/Main.java b/mozilla/js/rhino/org/mozilla/javascript/tools/shell/Main.java
index 56324737117..cbda7f358c7 100644
--- a/mozilla/js/rhino/org/mozilla/javascript/tools/shell/Main.java
+++ b/mozilla/js/rhino/org/mozilla/javascript/tools/shell/Main.java
@@ -262,6 +262,7 @@ public class Main {
                     in.close();
                     in = new FileReader(filename);
                 }
+                filename = new java.io.File(filename).getCanonicalPath();
             }
             catch (FileNotFoundException ex) {
                 Context.reportError(ToolErrorReporter.getMessage(
diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Main.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Main.java
index 56324737117..cbda7f358c7 100644
--- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Main.java
+++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Main.java
@@ -262,6 +262,7 @@ public class Main {
                     in.close();
                     in = new FileReader(filename);
                 }
+                filename = new java.io.File(filename).getCanonicalPath();
             }
             catch (FileNotFoundException ex) {
                 Context.reportError(ToolErrorReporter.getMessage(