--- /home/cpdev/src/classpath/java/lang/Package.java	2005-07-02 21:03:34.000000000 +0000
+++ java/lang/Package.java	2005-06-30 05:34:38.000000000 +0000
@@ -37,8 +37,6 @@
 
 package java.lang;
 
-import gnu.classpath.VMStackWalker;
-
 import java.net.URL;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
@@ -275,7 +273,7 @@
   public static Package getPackage(String name)
   {
     // Get the caller's classloader
-    ClassLoader cl = VMStackWalker.getCallingClassLoader();
+    ClassLoader cl = VMSecurityManager.currentClassLoader(Package.class);
     return cl != null ? cl.getPackage(name) : VMClassLoader.getPackage(name);
   }
 
@@ -288,7 +286,8 @@
   public static Package[] getPackages()
   {
     // Get the caller's classloader
-    ClassLoader cl = VMStackWalker.getCallingClassLoader();
+    Class c = VMSecurityManager.getClassContext(Package.class)[1];
+    ClassLoader cl = c.getClassLoader();
     return cl != null ? cl.getPackages() : VMClassLoader.getPackages();
   }