diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9bf29a25affd..965be17fb413 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-18  Graydon Hoare  <graydon@redhat.com>
+
+	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:
+	Fix up non-ansi comments.
+
+2004-06-18  Ranjit Mathew  <rmathew@hotmail.com>
+
+	* javax/swing/text/AbstractDocument.java: Adding missing import
+	for javax.swing.event.EventListenerList.
+	* javax/swing/text/DefaultCaret.java: Likewise.
+
 2004-06-17  Michael Koch  <konqueror@gmx.de>
 
 	* javax/swing/JToolBar.java
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
index 6f070f68b741..667e459a03af 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
@@ -1119,7 +1119,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilt
     }
   else if (GTK_IS_SCROLLED_WINDOW(ptr))
     {
-      // The event will go to the parent GtkLayout.
+      /* The event will go to the parent GtkLayout. */
       filterobj = GTK_OBJECT(GTK_WIDGET(ptr)->parent);
     }
   else
@@ -1174,7 +1174,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeF
     }
   else if (GTK_IS_SCROLLED_WINDOW(ptr))
     {
-      // The event will go to the parent GtkLayout.
+      /* The event will go to the parent GtkLayout. */
       filterobj = GTK_OBJECT(GTK_WIDGET(ptr)->parent);
     }
   else