diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e7e0f15fc88..519f9aed8f3 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-26  Tom Tromey  <tromey@redhat.com>
+
+	* java/awt/Robot.java (waitForIdle): Call invokeAndWait in a
+	static way.
+
 2005-04-26  Mark Wielaard  <mark@klomp.org>
 
 	* java/net/URL.java (URL(URL,String,URLStreamHandler)): Add spec
diff --git a/libjava/java/awt/Robot.java b/libjava/java/awt/Robot.java
index 23b6f810442..8741b89b450 100644
--- a/libjava/java/awt/Robot.java
+++ b/libjava/java/awt/Robot.java
@@ -394,10 +394,9 @@ public class Robot
       throw new IllegalThreadStateException ("Robot: waitForIdle called from "
 					     + "the event dispatch thread");
 
-    EventQueue q = Toolkit.getDefaultToolkit ().getSystemEventQueue ();
     try
       {
-	q.invokeAndWait (new Runnable () { public void run () { } });
+	EventQueue.invokeAndWait (new Runnable () { public void run () { } });
       }
     catch (InterruptedException e)
       {