diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index f82f64ab993e..6cd323902d99 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-05  Andrew Haley  <aph@redhat.com>
+
+	PR cp-tools/30706
+	* tools/gnu/classpath/tools/javah/JniIncludePrinter.java:
+	(printClass): Replace '/' in filenames with '_'.
+	* tools/gnu/classpath/tools/javah/JniStubPrinter.java
+	(printClass): Likewise.
+
 2007-02-05  Tom Tromey  <tromey@redhat.com>
 
 	* java/net/Proxy.java (equals): Handle case where address==null.
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class
index 5124ee9cbab4..6c29cc3c22b3 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniIncludePrinter.class differ
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class
index 9f82c33ee84f..ad9620710b8c 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/JniStubPrinter.class differ
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
index f29bfc30050f..5666d277d571 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
@@ -112,7 +112,9 @@ public class JniIncludePrinter
     if (! klass.hasNativeMethod())
       return;
     String xname = JniHelper.mangle(klass.name);
-    JniPrintStream out = (JniPrintStream) getPrintStream(klass.name + ".h", klass);
+    JniPrintStream out 
+      = (JniPrintStream) getPrintStream(klass.name.replace('/', '_') + ".h", 
+					klass);
     if (out == null)
       return;
     out.println();
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java
index 4e7871008d7d..758ec21c091a 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java
@@ -76,12 +76,14 @@ public class JniStubPrinter
     if (! klass.hasNativeMethod())
       return;
     String xname = JniHelper.mangle(klass.name);
-    JniPrintStream out = (JniPrintStream) getPrintStream(klass.name + ".c", klass);
+    JniPrintStream out 
+      = (JniPrintStream) getPrintStream(klass.name.replace('/', '_') + ".c", 
+					klass);
     if (out == null)
       return;
     out.println();
     out.print("#include <");
-    out.print(klass.name);
+    out.print(klass.name.replace('/', '_'));
     out.println(".h>");
 
     Iterator i = klass.methods.iterator();