diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e57e0044c48..3e9ba57418a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-18  Robert Schuster <thebohemian@gmx.net>
+
+	* java/awt/AWTEvent.java (toString): Added case
+	for source not being an AWT component.
+
 2005-04-18  Chris Burdess  <dog@gnu.org>
 
 	* gnu/java/net/BASE64.java: Truncate encoded byte array.
diff --git a/libjava/java/awt/AWTEvent.java b/libjava/java/awt/AWTEvent.java
index faa6dac25ef..872feda5863 100644
--- a/libjava/java/awt/AWTEvent.java
+++ b/libjava/java/awt/AWTEvent.java
@@ -1,5 +1,5 @@
 /* AWTEvent.java -- the root event in AWT
-   Copyright (C) 1999, 2000, 2002 Free Software Foundation
+   Copyright (C) 1999, 2000, 2002, 2005 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -246,6 +246,9 @@ public abstract class AWTEvent extends EventObject
     else if (source instanceof MenuComponent)
       string = getClass ().getName () + "[" + paramString () + "] on "
         + ((MenuComponent) source).getName ();
+    else 
+      string = getClass ().getName () + "[" + paramString () + "] on "
+    + source;
 
     return string;
   }