diff --git a/ChangeLog b/ChangeLog
index 01d24e3c53..2a38f75a6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar  6 13:17:58 1998  Marc Ewing  <marc@.redhat.com>
+
+	* gtk/gtkclist.c (real_select_row, real_unselect_row): 
+	  fix selection bugs
+
 Thu Mar  5 20:41:27 1998  Ian Main  <imain@gnu.org>
 
 	* gtk/gtkfilesel.c: Added
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 01d24e3c53..2a38f75a6e 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Fri Mar  6 13:17:58 1998  Marc Ewing  <marc@.redhat.com>
+
+	* gtk/gtkclist.c (real_select_row, real_unselect_row): 
+	  fix selection bugs
+
 Thu Mar  5 20:41:27 1998  Ian Main  <imain@gnu.org>
 
 	* gtk/gtkfilesel.c: Added
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 01d24e3c53..2a38f75a6e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Mar  6 13:17:58 1998  Marc Ewing  <marc@.redhat.com>
+
+	* gtk/gtkclist.c (real_select_row, real_unselect_row): 
+	  fix selection bugs
+
 Thu Mar  5 20:41:27 1998  Ian Main  <imain@gnu.org>
 
 	* gtk/gtkfilesel.c: Added
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 01d24e3c53..2a38f75a6e 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Mar  6 13:17:58 1998  Marc Ewing  <marc@.redhat.com>
+
+	* gtk/gtkclist.c (real_select_row, real_unselect_row): 
+	  fix selection bugs
+
 Thu Mar  5 20:41:27 1998  Ian Main  <imain@gnu.org>
 
 	* gtk/gtkfilesel.c: Added
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 01d24e3c53..2a38f75a6e 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Mar  6 13:17:58 1998  Marc Ewing  <marc@.redhat.com>
+
+	* gtk/gtkclist.c (real_select_row, real_unselect_row): 
+	  fix selection bugs
+
 Thu Mar  5 20:41:27 1998  Ian Main  <imain@gnu.org>
 
 	* gtk/gtkfilesel.c: Added
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 01d24e3c53..2a38f75a6e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Mar  6 13:17:58 1998  Marc Ewing  <marc@.redhat.com>
+
+	* gtk/gtkclist.c (real_select_row, real_unselect_row): 
+	  fix selection bugs
+
 Thu Mar  5 20:41:27 1998  Ian Main  <imain@gnu.org>
 
 	* gtk/gtkfilesel.c: Added
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 01d24e3c53..2a38f75a6e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Mar  6 13:17:58 1998  Marc Ewing  <marc@.redhat.com>
+
+	* gtk/gtkclist.c (real_select_row, real_unselect_row): 
+	  fix selection bugs
+
 Thu Mar  5 20:41:27 1998  Ian Main  <imain@gnu.org>
 
 	* gtk/gtkfilesel.c: Added
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 46b68115ab..e6be078af9 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -2948,6 +2948,7 @@ real_select_row (GtkCList * clist,
   if (clist_row->state == GTK_STATE_NORMAL)
     {
       clist_row->state = GTK_STATE_SELECTED;
+      clist->selection = g_list_append (clist->selection, clist_row);
 
       if (!GTK_CLIST_FROZEN (clist) && gtk_clist_row_is_visible (clist, row))
 	draw_row (clist, NULL, row, clist_row);
@@ -2972,6 +2973,7 @@ real_unselect_row (GtkCList * clist,
   if (clist_row->state == GTK_STATE_SELECTED)
     {
       clist_row->state = GTK_STATE_NORMAL;
+      clist->selection = g_list_remove (clist->selection, clist_row);
 
       if (!GTK_CLIST_FROZEN (clist) && gtk_clist_row_is_visible (clist, row))
 	draw_row (clist, NULL, row, clist_row);