diff --git a/ChangeLog b/ChangeLog
index c4ffbcb7f..e9942744b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-09  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Tools/GNUmakefile: build autogsdoc documentation automatically
+	if possible.
+
 2002-10-08  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/Foundation/NSDebug.h: Make warn logs de-selectable at
diff --git a/Tools/AGSParser.h b/Tools/AGSParser.h
index 959447207..56e389955 100644
--- a/Tools/AGSParser.h
+++ b/Tools/AGSParser.h
@@ -94,7 +94,7 @@
 - (unsigned) parsePreprocessor;
 - (NSMutableDictionary*) parseProtocol;
 - (NSMutableArray*) parseProtocolList;
-- (unsigned) parseSpace: (NSCharacterSet*)spaces;
+- (unsigned) parseSpace: (NSCharacterSet*)spaceSet;
 - (unsigned) parseSpace;
 - (void) reset;
 - (void) setDeclared: (NSString*)name;
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index 378c647d2..21de7c62f 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -78,6 +78,9 @@ autogsdoc_AGSDOC_FILES = autogsdoc.m \
 	AGSParser.h AGSOutput.h AGSIndex.h AGSHtml.h
 autogsdoc_DOC_INSTALL_DIR = Developer/Tools
 
+# Use local version of autogsdoc in case it is not installed
+AUTOGSDOC=./obj/autogsdoc
+
 SOURCES = gdomap.c gdnc.m defaults.m dread.m dremove.m dwrite.m \
 	autogsdoc.m AGSParser.m AGSOutput.m AGSIndex.m AGSHtml.m
 
@@ -95,7 +98,7 @@ include $(GNUSTEP_MAKEFILES)/tool.make
 include $(GNUSTEP_MAKEFILES)/ctool.make
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 
-ifeq ($(doc),yes)
+ifeq ($(GNUSTEP_BASE_HAVE_LIBXML),1)
 include $(GNUSTEP_MAKEFILES)/documentation.make
 endif