diff --git a/ChangeLog b/ChangeLog
index 08e4b9000..e78323af0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@
 	* Documentation/install.texi: Update.
 	* Documentation/news.texi: Likewise.
 
+	* Tools/autogsdoc.m (main): When no libxml, abort with a useful error
+	message.
+
+
 2002-01-02  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSXML.m: Tidied some methods and added autogsdoc comments.
diff --git a/Tools/autogsdoc.m b/Tools/autogsdoc.m
index 8a2a5ed00..7e22e4151 100644
--- a/Tools/autogsdoc.m
+++ b/Tools/autogsdoc.m
@@ -362,6 +362,13 @@ main(int argc, char **argv, char **env)
   [NSProcessInfo initializeWithArguments: argv count: argc environment: env];
 #endif
 
+#if HAVE_LIBXML == 0
+  NSLog(@"ERROR: The GNUstep Base Library was built\n"
+@"        without an available libxml library. Autogsdoc needs the libxml\n"
+@"        library to function. Aborting");
+  exit(1);
+#endif
+
   defs = [NSUserDefaults standardUserDefaults];
   [defs registerDefaults: [NSDictionary dictionaryWithObjectsAndKeys:
     @"Untitled", @"Project",