diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 70cf8597f4ad6a56b8511fa2e8c860f17010f8e7..c63678023acc6c808d6909a92a79b1b6e912b499 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-21  Mark Wielaard  <mark@klomp.org>
+
+	* gjavah.c (print_stub_or_jni): Mark functions only JNIEXPORT, not
+	extern.
+
 2004-05-19  Paolo Bonzini  <bonzini@gnu.org>
 
 	* typeck.c: Remove non-printable character 160.
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 45e5f251b9f0efe3c5ea572c9e3efd73d081a55f..19958f3832a33d1d666908c2ea550915ed189acd 100644
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -1567,7 +1567,7 @@ print_stub_or_jni (FILE* stream, JCF* jcf, int name_index,
 	return;
 
       if (flag_jni && ! stubs)
-	fputs ("extern JNIEXPORT ", stream);
+	fputs ("JNIEXPORT ", stream);
 
       /* If printing a method, skip to the return signature and print
 	 that first.  However, there is no return value if this is a