diff --git a/ChangeLog b/ChangeLog
index e47620d0d..3f5ea722b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-01  Mark McLoughlin  <mark@skynet.ie>
+
+	* src/session.c:
+	(save_yourself_possibly_done): send a SaveYourselfDone
+	if we're skipping this global save.
+	(save_yourself_callback): don't not save session state
+	if the save style is Global. Fixes #89390.
+
+	* theme-format.txt: update.
+
 2002-07-30  Pablo Saratxaga  <pablo@mandrakesoft.com>
 
 	* configure.in: Added Vietnamese (vi) to ALL_LINGUAS
diff --git a/src/session.c b/src/session.c
index 62f912baa..fd9191d03 100644
--- a/src/session.c
+++ b/src/session.c
@@ -190,6 +190,7 @@ typedef enum
   STATE_SAVING_PHASE_2,
   STATE_WAITING_FOR_INTERACT,
   STATE_DONE_WITH_INTERACT,
+  STATE_SKIPPING_GLOBAL_SAVE,
   STATE_FROZEN,
   STATE_REGISTERING
 } ClientState;
@@ -432,7 +433,8 @@ save_yourself_possibly_done (gboolean shutdown,
   
   if (current_state == STATE_SAVING_PHASE_1 ||
       current_state == STATE_SAVING_PHASE_2 ||
-      current_state == STATE_DONE_WITH_INTERACT)
+      current_state == STATE_DONE_WITH_INTERACT ||
+      current_state == STATE_SKIPPING_GLOBAL_SAVE)
     {
       meta_topic (META_DEBUG_SM, "Sending SaveYourselfDone\n");
       
@@ -497,6 +499,20 @@ save_yourself_callback (SmcConn   smc_conn,
     }
 #endif
 
+  /* ignore Global style saves
+   * 
+   * This interpretaion of the Local/Global/Both styles
+   * was discussed extensively on the xdg-list. See:
+   *
+   * https://listman.redhat.com/pipermail/xdg-list/2002-July/000615.html
+   */
+  if (save_style == SmSaveGlobal)
+    {
+      current_state = STATE_SKIPPING_GLOBAL_SAVE;
+      save_yourself_possibly_done (shutdown, successful);
+      return;
+    }
+
   interaction_allowed = interact_style != SmInteractStyleNone;
   
   current_state = STATE_SAVING_PHASE_1;
diff --git a/theme-format.txt b/theme-format.txt
index cd6c3569c..dc8f39ccb 100644
--- a/theme-format.txt
+++ b/theme-format.txt
@@ -219,7 +219,7 @@ Themes are in a simple XML-subset format.
 </frame_style_set>
 
 <!-- Each window type needs a style set 
-     Types: normal, dialog, modal_dialog, toolbar, menu, utility
+     Types: normal, dialog, modal_dialog, menu, utility, border
   -->
 <window type="normal" style_set="normal"/>