diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 6cd323902d9..efc15120966 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-06  Tom Tromey  <tromey@redhat.com>
+
+	PR libgcj/30707:
+	* tools/gnu/classpath/tools/javah/JniIncludePrinter.java
+	(printClass): Always print a header.
+
 2007-02-05  Andrew Haley  <aph@redhat.com>
 
 	PR cp-tools/30706
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 6c29cc3c22b..a89e0d2e9a8 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/gnu/classpath/tools/javah/JniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
index 5666d277d57..dc19af25516 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
@@ -1,5 +1,5 @@
 /* JniIncludePrinter.java - Generate a JNI header file
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -109,8 +109,6 @@ public class JniIncludePrinter
 
   public void printClass(ClassWrapper klass) throws IOException
   {
-    if (! klass.hasNativeMethod())
-      return;
     String xname = JniHelper.mangle(klass.name);
     JniPrintStream out 
       = (JniPrintStream) getPrintStream(klass.name.replace('/', '_') + ".h",