diff --git a/ChangeLog b/ChangeLog
index ea97c4880..32bb63c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-27 19:29 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/GSNibContainer.m: [GSNibContainer awakeWithContext:]
+	Added code to set the services and windows menus as designated in
+	Gorm.  Addresses Report #5205
+	
 2003-09-27  David Ayers  <d.ayers@inode.at>
 
 	* Source/NSCell.m (-compare:):  Compare the stringValue of
diff --git a/Source/GSNibTemplates.m b/Source/GSNibTemplates.m
index b1b56958f..689834436 100644
--- a/Source/GSNibTemplates.m
+++ b/Source/GSNibTemplates.m
@@ -136,6 +136,26 @@ static const int currentVersion = 1; // GSNibItem version number...
 	  [NSApp setMainMenu: menu];
 	}
 
+      /*
+       * Set the Services menu.
+       * Report #5205, Services/Window menu does not behave correctly.
+       */
+      menu = [nameTable objectForKey: @"NSServicesMenu"];
+      if (menu != nil && [menu isKindOfClass: [NSMenu class]] == YES)
+	{
+	  [NSApp setServicesMenu: menu];
+	}
+
+      /*
+       * Set the Services menu.
+       * Report #5205, Services/Window menu does not behave correctly.
+       */
+      menu = [nameTable objectForKey: @"NSWindowsMenu"];
+      if (menu != nil && [menu isKindOfClass: [NSMenu class]] == YES)
+	{
+	  [NSApp setWindowsMenu: menu];
+	}
+
       /*
        * Now tell all the objects that they have been loaded from
        * a nib.