diff --git a/ChangeLog b/ChangeLog
index d302f9059..906fd06f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-01  Adam Fedor  <fedor@gnu.org>
+
+	* Documentation/GNUmakefile.postamble (after-install): Install
+	gsdoc docs in proper places.
+	* Source/DocMakefile: Add GuiUser DOCUMENT
+
+	* Images/GNUmakefile: Remove obsolete files.
+
 2003-07-31  David Ayers  <d.ayers@inode.at>
 
 	* Created tag 'pre-header-reorg-20030731'.
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index e35ddb4ce..de1eaed62 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -67,7 +67,10 @@ BUGS_DOC_INSTALL_DIR = Developer/Gui/ReleaseNotes/$(VERSION)
 # file using the make file ../Source/DocMakefile.  If headers are added to the
 # library, you need to modify that file to get the autogsdoc tool to use them.
 #
-REF_DOC_INSTALL_DIR = $(GNUSTEP_DOCUMENTATION)/Developer/Gui/Reference
+DOCUMENT_NAME = Gui GuiAdditions GuiUser
+Gui_DOC_INSTALL_DIR = Developer/Gui/Reference
+GuiAdditions_DOC_INSTALL_DIR = Developer/Gui/Additions
+GuiUser_DOC_INSTALL_DIR = User/Gui
 
 -include GNUmakefile.preamble
 
diff --git a/Documentation/GNUmakefile.postamble b/Documentation/GNUmakefile.postamble
index 20f04f517..8643c8304 100644
--- a/Documentation/GNUmakefile.postamble
+++ b/Documentation/GNUmakefile.postamble
@@ -37,15 +37,21 @@ after-all::
 # Install the library reference documentaion manually
 #
 after-install::
-	rm -rf $(REF_DOC_INSTALL_DIR)
-	$(MKINSTALLDIRS) $(REF_DOC_INSTALL_DIR)
+	rm -rf $(GNUSTEP_DOCUMENTATION)/$(Gui_DOC_INSTALL_DIR)
+	$(MKDIRS) $(GNUSTEP_DOCUMENTATION)/$(Gui_DOC_INSTALL_DIR)
 	(cd Gui; $(TAR) cf - .) | \
-	  (cd $(REF_DOC_INSTALL_DIR); $(TAR) xf -)
-ifneq ($(CHOWN_TO),)
-	$(CHOWN) -R $(CHOWN_TO) \
-	  $(REF_DOC_INSTALL_DIR)
-endif
-
+	  (cd $(GNUSTEP_DOCUMENTATION)/$(Gui_DOC_INSTALL_DIR); $(TAR) xf -)
+	rm -rf $(GNUSTEP_DOCUMENTATION)/$(Gui_DOC_INSTALL_DIR)/CVS
+	rm -rf $(GNUSTEP_DOCUMENTATION)/$(GuiAdditions_DOC_INSTALL_DIR)
+	$(MKDIRS) $(GNUSTEP_DOCUMENTATION)/$(GuiAdditions_DOC_INSTALL_DIR)
+	(cd GuiAdditions; $(TAR) cf - .) | \
+	  (cd $(GNUSTEP_DOCUMENTATION)/$(GuiAdditions_DOC_INSTALL_DIR); $(TAR) xf -)
+	rm -rf $(GNUSTEP_DOCUMENTATION)/$(GuiAdditions_DOC_INSTALL_DIR)/CVS
+	rm -rf $(GNUSTEP_DOCUMENTATION)/$(GuiUser_DOC_INSTALL_DIR)
+	$(MKDIRS) $(GNUSTEP_DOCUMENTATION)/$(GuiUser_DOC_INSTALL_DIR)
+	(cd GuiUser; $(TAR) cf - .) | \
+	  (cd $(GNUSTEP_DOCUMENTATION)/$(GuiUser_DOC_INSTALL_DIR); $(TAR) xf -)
+	rm -rf $(GNUSTEP_DOCUMENTATION)/$(GuiUser_DOC_INSTALL_DIR)/CVS
 
 # Things to do before uninstalling
 # before-uninstall::
diff --git a/Documentation/GuiUser/.cvsignore b/Documentation/GuiUser/.cvsignore
new file mode 100644
index 000000000..2d19fc766
--- /dev/null
+++ b/Documentation/GuiUser/.cvsignore
@@ -0,0 +1 @@
+*.html
diff --git a/Documentation/Gui/DefaultsSummary.gsdoc b/Documentation/GuiUser/DefaultsSummary.gsdoc
similarity index 100%
rename from Documentation/Gui/DefaultsSummary.gsdoc
rename to Documentation/GuiUser/DefaultsSummary.gsdoc
diff --git a/Documentation/Gui/LanguageSetup.gsdoc b/Documentation/GuiUser/LanguageSetup.gsdoc
similarity index 100%
rename from Documentation/Gui/LanguageSetup.gsdoc
rename to Documentation/GuiUser/LanguageSetup.gsdoc
diff --git a/Images/GNUmakefile b/Images/GNUmakefile
index 006377f53..9573885ce 100644
--- a/Images/GNUmakefile
+++ b/Images/GNUmakefile
@@ -38,11 +38,7 @@ common_ArrowUp.tiff \
 common_ArrowRight.tiff \
 common_3DArrowRight.tiff \
 common_ArrowLeft.tiff \
-common_ArrowDownH.tiff \
-common_ArrowUpH.tiff \
-common_ArrowRightH.tiff \
 common_3DArrowRightH.tiff \
-common_ArrowLeftH.tiff \
 common_2DCheckMark.tiff \
 common_Close.tiff \
 common_CloseH.tiff \
diff --git a/Source/DocMakefile b/Source/DocMakefile
index 351ae000f..183303e09 100644
--- a/Source/DocMakefile
+++ b/Source/DocMakefile
@@ -139,15 +139,14 @@ GSTable.h \
 GSHbox.h \
 GSVbox.h \
 
-DOCUMENT_NAME = Gui GuiAdditions
+DOCUMENT_NAME = Gui GuiAdditions GuiUser
 
-Gui_DOC_INSTALL_DIR = Developer
-GuiAdditions_DOC_INSTALL_DIR = Developer
+Gui_DOC_INSTALL_DIR = Developer/Gui/Reference
+GuiAdditions_DOC_INSTALL_DIR = Developer/Gui/Reference
+GuiUser_DOC_INSTALL_DIR = User/Gui
 
 Gui_AGSDOC_FILES = ../Documentation/Gui/Gui.gsdoc \
 	../Documentation/Gui/Introduction.gsdoc \
-	../Documentation/Gui/DefaultsSummary.gsdoc \
-	../Documentation/Gui/LanguageSetup.gsdoc \
 	../Documentation/Gui/NSBundleAdditions.gsdoc \
 	../Documentation/Gui/NSCoderAdditions.gsdoc \
 	../Documentation/Gui/NSMutableAttributedStringAdditions.gsdoc \
@@ -156,6 +155,10 @@ Gui_AGSDOC_FILES = ../Documentation/Gui/Gui.gsdoc \
 
 GuiAdditions_AGSDOC_FILES = $(AUTOGSDOC_HEADERS_GUIADD)
 
+GuiUser_AGSDOC_FILES =	\
+	../Documentation/Gui/DefaultsSummary.gsdoc \
+	../Documentation/Gui/LanguageSetup.gsdoc
+
 #
 # Hack ... using the -DocumentationDirectory flag overrides the value
 # used by the make package, and puts our output in the documentation
@@ -191,6 +194,21 @@ GuiAdditions_AGSDOC_FLAGS = \
 	DEFINE_RINT_IF_MISSING=""; \
 	}' -Up Gui
 
+GuiUser_AGSDOC_FLAGS = \
+	-DocumentationDirectory ../Documentation/GuiUser \
+	-HeaderDirectory ../Headers/AppKit \
+	-Declared AppKit \
+	-Standards YES \
+	-ConstantsTemplate TypesAndConstants \
+	-FunctionsTemplate Functions \
+	-MacrosTemplate Functions \
+	-TypedefsTemplate TypesAndConstants \
+	-VariablesTemplate TypesAndConstants \
+	-WordMap '{\
+	APPKIT_EXPORT=extern;APPKIT_DECLARE="";\
+	DEFINE_RINT_IF_MISSING=""; \
+	}' -Up GuiUser
+
 include $(GNUSTEP_MAKEFILES)/documentation.make
 
 before-all::    ../Documentation/Gui \