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 dd8ef46010a..0ac7d7de694 100644
--- a/mozilla/js/rhino/org/mozilla/javascript/tools/shell/Main.java
+++ b/mozilla/js/rhino/org/mozilla/javascript/tools/shell/Main.java
@@ -100,7 +100,14 @@ public class Main extends ScriptableObject {
         Scriptable argsObj = cx.newArray(global, array);
         global.defineProperty("arguments", argsObj,
                               ScriptableObject.DONTENUM);
-                       
+        
+        // Set up "environment" in the global scope to provide access to the
+        // System environment variables.
+        Environment.defineClass(sharedGlobal);
+        Environment environment = new Environment(global);
+        global.defineProperty("environment", environment,
+                              ScriptableObject.DONTENUM);
+        
         /*
         TODO: enable debugger
         if (global.debug) {
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 dd8ef46010a..0ac7d7de694 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
@@ -100,7 +100,14 @@ public class Main extends ScriptableObject {
         Scriptable argsObj = cx.newArray(global, array);
         global.defineProperty("arguments", argsObj,
                               ScriptableObject.DONTENUM);
-                       
+        
+        // Set up "environment" in the global scope to provide access to the
+        // System environment variables.
+        Environment.defineClass(sharedGlobal);
+        Environment environment = new Environment(global);
+        global.defineProperty("environment", environment,
+                              ScriptableObject.DONTENUM);
+        
         /*
         TODO: enable debugger
         if (global.debug) {