diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 83de49090b6a2144c996eb0feba1a01a3c652558..3a3d8a221fe4c19c532713e433d331a2c796712d 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-17  Tom Tromey  <tromey@redhat.com>
+
+	* tools/gnu/classpath/tools/javah/PathOptionGroup.java
+	(PathOptionGroup): Set default boot class path.
+
 2006-12-14  Andrew Haley  <aph@redhat.com>
 
 	* tools/gnu/classpath/tools/jar/Creator.java: Close the
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class
index 0613196320c81b24a703470c377399c7a13dc5af..a4fe014e13728d561c74d22c45cf71979eada108 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class differ
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class
index 8e7c07f5904f58ed05cf2bdf1b20cf1901173096..6786f255ac56a77d3e856dacfaee7660bd0186b8 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class differ
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class
index 1e0725da07be152f015c80aea73886b75859c695..08d44961c3eb8684a33e53a10ef4874f3acf4ae5 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class differ
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class
index 5791d4f8269058b4a896022b3384876c5a41536b..e8f36fc5b3e39e937fecf46bbadb21dac4da7b18 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class differ
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class
index 4833679fb4b565aa2bd37761f3f322526dc24408..41960117caaa147941150b326c0f3359ef36a91e 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class differ
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java b/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java
index 4287354aed657e42f34ab63dff6590d9cfd3fe95..efb5f7a70b2e18717648299af4e39b1c15b7fdc0 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java
@@ -1,5 +1,5 @@
 /* PathOptionGroup.java - handle classpath-setting options
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -89,6 +89,11 @@ public class PathOptionGroup
   {
     super("Class path options");
 
+    // Use the VM's built-in boot class path by default.
+    String boot = System.getProperty("sun.boot.class.path");
+    if (boot != null)
+      setPath(bootclasspath, boot);
+
     add(new Option("classpath", "Set the class path", "PATH")
     {
       public void parsed(String path) throws OptionException