diff --git a/ChangeLog b/ChangeLog
index 377a33791..769c90878 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-18  Havoc Pennington  <hp@redhat.com>
+
+	* src/window.c (update_net_wm_state): handle fullscreen state
+	here.
+
 2002-09-15  Havoc Pennington  <hp@pobox.com>
 
 	* src/session.c (save_state): escape the window title before 
diff --git a/src/window.c b/src/window.c
index 5fb9d3acf..e3ae4c5d0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4385,6 +4385,8 @@ update_net_wm_state (MetaWindow *window)
             window->wm_state_skip_taskbar = TRUE;
           else if (atoms[i] == window->display->atom_net_wm_state_skip_pager)
             window->wm_state_skip_pager = TRUE;
+          else if (atoms[i] == window->display->atom_net_wm_state_fullscreen)
+            window->fullscreen = TRUE;
       
           ++i;
         }