diff --git a/ChangeLog b/ChangeLog
index 719dd0dec..4500e444c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-10-22  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSWindow.m (-initWithContentRect:...): Remove window
+	from windows menu if window_level is > dock window.
+
+	* Source/NSMenu.m (NSMenuWindow): Implement class (from backend)
+	so backend class can be removed.
+
 Sat Oct 23  1999  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	* Source/NSSavePanel.m Moved FileManager at the beginning of file,
diff --git a/Documentation/.cvsignore b/Documentation/.cvsignore
index 7e2524963..4d3ee03a6 100644
--- a/Documentation/.cvsignore
+++ b/Documentation/.cvsignore
@@ -1,4 +1,19 @@
-gnustep-gui.info
 gnustep-gui.texi
 version.texi
 version.tmpl.texi
+*.log
+*.dvi
+*.ps
+*.html
+*.info
+*.aux
+*.toc
+*.cp
+*.fn
+*.vr
+*.tp
+*.ky
+*.pg
+*.ps
+*.vrs
+
diff --git a/Source/NSMenu.m b/Source/NSMenu.m
index cab773e8b..15dd4c67a 100644
--- a/Source/NSMenu.m
+++ b/Source/NSMenu.m
@@ -962,13 +962,38 @@ NSArray* array;
 @end
 
 @implementation NSMenuWindow
+
 + (void) initialize
 {
-  if (self == [NSMenu class])
+  if (self == [NSMenuWindow class])
     {
       [self setVersion: 1];
     }
 }
+
+- (BOOL) canBecomeMainWindow
+{
+  return NO;
+}
+
+- (BOOL) canBecomeKeyWindow
+{
+  return NO;
+}
+
+- (void) initDefaults
+{
+  [super initDefaults];
+  menu_exclude = YES;           // Don't show in windows menu.
+  window_level = NSSubmenuWindowLevel;
+  is_released_when_closed = NO;
+}
+
+- (BOOL) worksWhenModal
+{
+  return YES;
+}
+
 @end
 
 @implementation NSMenuWindowTitleView
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index fd4deef08..567c6f746 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -315,6 +315,10 @@ static NSMapTable* windowmaps = NULL;
   DPSgrestore(context);
 
   NSMapInsert (windowmaps, (void*)window_num, self);
+  /* I'm not sure we even need this if menu_exclude is set correctly */
+  if ([self level] >= NSDockWindowLevel)
+    [[NSApplication sharedApplication] removeWindowsItem: self];
+
   NSDebugLog(@"NSWindow end of init\n");
   return self;
 }