diff --git a/Source/DocMakefile b/Source/DocMakefile
index 666001619..81e27f666 100644
--- a/Source/DocMakefile
+++ b/Source/DocMakefile
@@ -244,7 +244,8 @@ GCObject.h \
 # directory.
 #
 Base_AGSDOC_FLAGS = \
-	-MakeFrames YES \
+	-MakeFrames NO \
+	-IndexFile Base \
 	-DocumentationDirectory ../Documentation/Base \
 	-HeaderDirectory ../Headers/Foundation \
 	-Declared Foundation \
@@ -259,7 +260,8 @@ Base_AGSDOC_FLAGS = \
 	}' -Up Base
 
 BaseAdditions_AGSDOC_FLAGS = \
-	-MakeFrames YES \
+	-MakeFrames NO \
+	-IndexFile BaseAdditions \
 	-DocumentationDirectory ../Documentation/BaseAdditions \
 	-HeaderDirectory ../Headers/GNUstepBase \
 	-Declared GNUstepBase \
diff --git a/Tools/AGSHtml.h b/Tools/AGSHtml.h
index c23dd585a..e8d9f9cff 100644
--- a/Tools/AGSHtml.h
+++ b/Tools/AGSHtml.h
@@ -50,6 +50,7 @@
   unsigned		sssect;
   BOOL			isContentsDoc;
   BOOL			ivarsAtEnd;
+  BOOL			cssNavigation;
   BOOL			verbose;
   BOOL			warn;
 }
diff --git a/Tools/AGSHtml.m b/Tools/AGSHtml.m
index 8a3e9c9b5..ad2e6b9f3 100644
--- a/Tools/AGSHtml.m
+++ b/Tools/AGSHtml.m
@@ -27,8 +27,6 @@
 #import "GNUstepBase/NSString+GNUstepBase.h"
 #import "GNUstepBase/NSMutableString+GNUstepBase.h"
 
-#define	navcss	1
-
 /*
  * Define constants for use if we are built with apple Foundation
  */
@@ -255,6 +253,7 @@ static NSMutableSet	*textNodes = nil;
       project = RETAIN([defs stringForKey: @"Project"]);
       verbose = [defs boolForKey: @"Verbose"];
       warn = [defs boolForKey: @"Warn"];
+      cssNavigation = [defs boolForKey: @"MakeFrames"] ? NO : YES;
     }
   return self;
 }
@@ -805,7 +804,7 @@ static NSMutableSet	*textNodes = nil;
 
 	  [self decIndent];
 
-	  if (navcss)
+	  if (cssNavigation)
 	    {
 	      [self decIndent];
               [buf appendString: indent];
@@ -1332,7 +1331,7 @@ static NSMutableSet	*textNodes = nil;
 	      [self incIndent];
             }
 
-	  if (navcss)
+	  if (cssNavigation)
 	    {
               [buf appendString: indent];
               [buf appendString: @"<div class=\"content-bar\">\n"];
diff --git a/Tools/autogsdoc.m b/Tools/autogsdoc.m
index a89b82c6e..b1ffba75b 100644
--- a/Tools/autogsdoc.m
+++ b/Tools/autogsdoc.m
@@ -813,6 +813,9 @@ main(int argc, char **argv, char **env)
     @"FunctionsTemplate",
     @"\t\tSTR\t(\"\")\n\tfile into which docs for macros "
       @"should be consolidated",
+    @"IndexFile",
+    @"\t\tSTR\t(\"\")\n\tHTML file name (extension omitted) "
+      @"copied to index.html",
     @"MacrosTemplate",
     @"\t\tSTR\t(\"\")\n\tfile into which docs for typedefs "
       @"should be consolidated",
@@ -2102,6 +2105,9 @@ main(int argc, char **argv, char **env)
   count = [gFiles count];
   if (generateHtml == YES && count > 0)
     {
+      NSString		*htmlIndexFile;
+
+      htmlIndexFile = [defs stringForKey: @"IndexFile"];
       pool = [NSAutoreleasePool new];
 
       for (i = 0; i < count; i++)
@@ -2208,6 +2214,17 @@ main(int argc, char **argv, char **env)
 		    {
 		      NSLog(@"Sorry unable to write %@", htmlfile);
 		    }
+		  if ([file isEqual: htmlIndexFile])
+		    {
+		      NSString	*s;
+
+		      s = [documentationDirectory
+			stringByAppendingPathComponent: @"index.html"];
+		      if ([d writeToFile: s atomically: YES])
+			{
+			  NSLog(@"Sorry unable to write %@ to %s", htmlfile, s);
+			}
+		    }
 		}
 	    }
 	  else if ([arg hasSuffix: @".gsdoc"] == YES)