diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index db9463e609a..40009856bee 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-24  Tom Tromey  <tromey@redhat.com>
+
+	PR java/16789:
+	* testsuite/libjava.lang/pr16789.out: New file.
+	* testsuite/libjava.lang/pr16789.java: New file.
+
 2004-09-24  Andrew Haley  <aph@redhat.com>
 
 	PR java/16927
diff --git a/libjava/testsuite/libjava.lang/pr16789.java b/libjava/testsuite/libjava.lang/pr16789.java
new file mode 100644
index 00000000000..64c43f30417
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/pr16789.java
@@ -0,0 +1,15 @@
+// gcj used to generate incorrect bytecode for
+// staticMethod().staticMethod()
+public class pr16789
+{
+  public void foo()
+  {
+    System.out.println(Thread.currentThread().holdsLock(this));
+  }
+
+  public static void main(String[] args)
+  {
+    new pr16789().foo();
+  }
+}
+
diff --git a/libjava/testsuite/libjava.lang/pr16789.out b/libjava/testsuite/libjava.lang/pr16789.out
new file mode 100644
index 00000000000..c508d5366f7
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/pr16789.out
@@ -0,0 +1 @@
+false