diff --git a/ChangeLog b/ChangeLog
index b945ae79b..7e624f3fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-12  Alexander Malmberg  <alexander@malmberg.org>
+
+	* Source/GSServicesManager.m (-rebuildServicesMenu): Disable auto-
+	enabling while updating the menu.
+
 2002-06-12  Alexander Malmberg  <alexander@malmberg.org>
 
 	* Source/GSServicesManager.m (-loadServices): Only update timestamp
diff --git a/Source/GSServicesManager.m b/Source/GSServicesManager.m
index 696ae994e..b5ac92d0a 100644
--- a/Source/GSServicesManager.m
+++ b/Source/GSServicesManager.m
@@ -747,9 +747,11 @@ static NSString         *disabledName = @".GNUstepDisabled";
       SEL               sel = @selector(doService:);
       NSMenu            *submenu = nil;
 
+      [_servicesMenu setAutoenablesItems: NO];
       pos = [_servicesMenu numberOfItems];
       for (; pos; pos--)
         [_servicesMenu removeItemAtIndex: 0];
+      [_servicesMenu setAutoenablesItems: YES];
 
       keyEquivalents = [NSMutableSet setWithCapacity: 4];
       for (loc0 = pos = 0; pos < [_menuTitles count]; pos++)