diff --git a/ChangeLog b/ChangeLog
index d8f6f9e3a0..9b1deeb05e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-06-22  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept
+	"<WINDOWTYPE>" as a valid accel path.  (#144427, Philip 
+	Kendall)	
+
 	* gtk/gtkselection.c (GTK_SELECTION_MAX_SIZE): Make sure 
 	this gets defined for all backends, so linux-fb has a 
 	chance of compiling.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d8f6f9e3a0..9b1deeb05e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2004-06-22  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept
+	"<WINDOWTYPE>" as a valid accel path.  (#144427, Philip 
+	Kendall)	
+
 	* gtk/gtkselection.c (GTK_SELECTION_MAX_SIZE): Make sure 
 	this gets defined for all backends, so linux-fb has a 
 	chance of compiling.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d8f6f9e3a0..9b1deeb05e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2004-06-22  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept
+	"<WINDOWTYPE>" as a valid accel path.  (#144427, Philip 
+	Kendall)	
+
 	* gtk/gtkselection.c (GTK_SELECTION_MAX_SIZE): Make sure 
 	this gets defined for all backends, so linux-fb has a 
 	chance of compiling.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d8f6f9e3a0..9b1deeb05e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2004-06-22  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkaccelmap.c (_gtk_accel_path_is_valid): Accept
+	"<WINDOWTYPE>" as a valid accel path.  (#144427, Philip 
+	Kendall)	
+
 	* gtk/gtkselection.c (GTK_SELECTION_MAX_SIZE): Make sure 
 	this gets defined for all backends, so linux-fb has a 
 	chance of compiling.
diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index d21bd6d42f..bfdc74af30 100644
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -121,7 +121,7 @@ _gtk_accel_path_is_valid (const gchar *accel_path)
       accel_path[1] == '<' || accel_path[1] == '>' || !accel_path[1])
     return FALSE;
   p = strchr (accel_path, '>');
-  if (!p || p[1] != '/')
+  if (!p || (p[1] != 0 && p[1] != '/'))
     return FALSE;
   return TRUE;
 }