diff --git a/ChangeLog b/ChangeLog
index 10693f109..bf9def572 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-11  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Tools/gdomap.8.gz: Added man page adapted from internal docs by
+	martin@mb-itconsulting.com
+	* Tools/GNUmakefile: Declare man pages to be installed
+	* Tools/Makefile.postamble: Install man pages
+
 2003-05-08  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Tools/xmlparse.m: new utility to parse/validate xml, for testing
diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m
index 75fa24098..d09c29267 100644
--- a/Source/Additions/GSMime.m
+++ b/Source/Additions/GSMime.m
@@ -3993,7 +3993,7 @@ static NSCharacterSet	*tokenSet = nil;
 	  if ([v isEqual: [type parameterForKey: @"type"]] == NO)
 	    {
 	      [NSException raise: NSInvalidArgumentException
-		format: @"mutipart/related 'type' (%@) does not match "
+		format: @"multipart/related 'type' (%@) does not match "
 		@"that of the 'start' part (%@)",
 		[type parameterForKey: @"type"], v];
 	    }
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index ae7564eb0..666b96808 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -41,6 +41,10 @@ DTD_FILES = plist-0_9.dtd \
 doctemplatesdir = $(GNUSTEP_LIBRARY)/DocTemplates
 DOCTEMPLATES_FILES = indextemplate.gsdoc AutoDocTemplate.gsdoc
 
+# Manual pages to install
+MAN1_PAGES = 
+MAN8_PAGES = gdomap.8.gz
+
 # The application to be compiled
 ifeq ($(add),yes)
 TOOL_NAME = autogsdoc
diff --git a/Tools/Makefile.postamble b/Tools/Makefile.postamble
index 8bde87220..e9652330d 100644
--- a/Tools/Makefile.postamble
+++ b/Tools/Makefile.postamble
@@ -31,6 +31,21 @@ after-install::
 	for file in $(DOCTEMPLATES_FILES); do \
 	  $(INSTALL_DATA) $$file $(doctemplatesdir)/$$file; \
 	done; \
+	if [ ! -f $(GNUSTEP_DOCUMENTATION_MAN) ]; then \
+	  $(MKDIRS) $(GNUSTEP_DOCUMENTATION_MAN); \
+	fi; \
+	if [ ! -f $(GNUSTEP_DOCUMENTATION_MAN)/man1 ]; then \
+	  $(MKDIRS) $(GNUSTEP_DOCUMENTATION_MAN)/man1; \
+	fi; \
+	for file in $(MAN1_PAGES); do \
+	  $(INSTALL_DATA) $$file $(GNUSTEP_DOCUMENTATION_MAN)/man1/$$file; \
+	done; \
+	if [ ! -f $(GNUSTEP_DOCUMENTATION_MAN)/man8 ]; then \
+	  $(MKDIRS) $(GNUSTEP_DOCUMENTATION_MAN)/man8; \
+	fi; \
+	for file in $(MAN8_PAGES); do \
+	  $(INSTALL_DATA) $$file $(GNUSTEP_DOCUMENTATION_MAN)/man8/$$file; \
+	done; \
 	if [ "`$(WHOAMI)`" != "root" ]; then \
 	  echo ""; \
 	  echo "************************************************************"; \
diff --git a/Tools/gdomap.8.gz b/Tools/gdomap.8.gz
new file mode 100644
index 000000000..24448e882
Binary files /dev/null and b/Tools/gdomap.8.gz differ