diff --git a/ChangeLog b/ChangeLog
index 834bb5941..f5cbe7422 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-22  Rob Adams <robadams@ucla.edu>
+
+	* window.c (set_wm_state): modify comment to explain why the icon
+	window element is set to None.  Fix for #97357 thanks to Gregory
+	Merchan.
+
 2003-02-22  Havoc Pennington  <hp@pobox.com>
 
 	* README: fix a typo, pointed out by Steve Kemp
diff --git a/src/window.c b/src/window.c
index 41e8287be..a1d247043 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1047,8 +1047,8 @@ set_wm_state (MetaWindow *window,
   meta_verbose ("Setting wm state %s on %s\n",
                 wm_state_to_string (state), window->desc);
   
-  /* twm sets the icon window as data[1], I couldn't find that in
-   * ICCCM.
+  /* Metacity doesn't use icon windows, so data[1] should be None
+   * according to the ICCCM 2.0 Section 4.1.3.1.
    */
   data[0] = state;
   data[1] = None;