diff --git a/doc/en_US/sgml/FAQ/Makefile b/doc/en_US/sgml/FAQ/Makefile
index 62ec1b836d..176ebc92a4 100644
--- a/doc/en_US/sgml/FAQ/Makefile
+++ b/doc/en_US/sgml/FAQ/Makefile
@@ -21,8 +21,8 @@ html:  FAQ.sgml
 install:
 	@if [ -e FAQ.txt ]; \
 		then \
-		echo "Copying FAQ.txt to $(INSTDIR)"; \
-		cp FAQ.txt $(INSTDIR)/; \
+		echo "Moving FAQ.txt to $(INSTDIR)"; \
+		mv FAQ.txt $(INSTDIR)/; \
 	fi
 	-@if [ -e FAQ.html ]; \
 		then \
@@ -30,34 +30,35 @@ install:
 			then \
 			mkdir -p $(INSTDIR)/html/FAQ; \
 		fi; \
-		echo "Tidying HTML files and coping them to $(INSTDIR)/html"; \
+		echo "Tidying HTML files and moving them to $(INSTDIR)/html"; \
 		echo "You may get an ignored error here, it's OK";\
 		tidy -i -clean <FAQ.html >$(INSTDIR)/html/FAQ/FAQ.html 2> /dev/null; \
+		rm FAQ.html; \
 	fi
 	@if [ -e FAQ.ps ]; \
 		then \
-		echo "Copying FAQ.ps to $(INSTDIR)/ps"; \
+		echo "Moving FAQ.ps to $(INSTDIR)/ps"; \
 		if [ ! -d $(INSTDIR)/ps ]; \
 			then \
 			mkdir $(INSTDIR)/ps; \
 		fi; \
-		cp FAQ.ps $(INSTDIR)/ps; \
+		mv FAQ.ps $(INSTDIR)/ps; \
 	fi
 
 clean: 
 	@if [ -e FAQ.txt ];\
 		then \
 		rm FAQ.txt ;\
-		rm txt; \
 	fi
+	-rm txt
 	@if [ -e FAQ.html ]; \
 		then \
 		rm FAQ.html; \
-		rm html; \
 	fi
+	-rm html
 	@if [ -e FAQ.ps ]; \
 		then \
 		rm FAQ.ps; \
-		rm ps; \
 	fi
+	-rm ps
 
diff --git a/doc/en_US/sgml/Makefile b/doc/en_US/sgml/Makefile
new file mode 100644
index 0000000000..d063c74a4c
--- /dev/null
+++ b/doc/en_US/sgml/Makefile
@@ -0,0 +1,42 @@
+# Makefile for phpGroupWare documentation
+# Written by Brandon Neill
+# Copyright 2002
+
+.PHONY: admin user FAQ
+
+all: admin user FAQ
+
+admin:
+	$(MAKE) -C admin
+
+user:
+	$(MAKE) -C user
+
+FAQ:
+	$(MAKE) -C FAQ
+
+ps:
+	$(MAKE) -C admin ps
+	$(MAKE) -C user ps
+	$(MAKE) -C FAQ ps
+
+html:
+	$(MAKE) -C admin html
+	$(MAKE) -C user html
+	$(MAKE) -C FAQ html
+
+txt:
+	$(MAKE) -C admin txt
+	$(MAKE) -C user txt
+	$(MAKE) -C FAQ txt
+
+clean:
+	$(MAKE) -C admin clean
+	$(MAKE) -C user clean
+	$(MAKE) -C FAQ clean
+
+install:
+	$(MAKE) -C admin install
+	$(MAKE) -C user install
+	$(MAKE) -C FAQ install
+
diff --git a/doc/en_US/sgml/admin/phpGroupWare-Admin-Manual.sgml b/doc/en_US/sgml/admin/phpGroupWare-Admin-Manual.sgml
index 1825a4516e..d825be2441 100755
--- a/doc/en_US/sgml/admin/phpGroupWare-Admin-Manual.sgml
+++ b/doc/en_US/sgml/admin/phpGroupWare-Admin-Manual.sgml
@@ -27,6 +27,8 @@ Brandon Neill just wanted to figure out how to use the program and decided to wr
 </para>
 </authorblurb>
 </author>
+<author>
+<firstname>
 </authorgroup>
 <pubdate>$Revision$, $Date$</pubdate>
 <abstract>
diff --git a/doc/en_US/sgml/user/phpGroupWare-User-Manual.sgml b/doc/en_US/sgml/user/phpGroupWare-User-Manual.sgml
index f48bb7e9e2..9d53b3041a 100644
--- a/doc/en_US/sgml/user/phpGroupWare-User-Manual.sgml
+++ b/doc/en_US/sgml/user/phpGroupWare-User-Manual.sgml
@@ -1,4 +1,4 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
 <!ENTITY introduction SYSTEM "introduction.sgml">
 <!ENTITY general SYSTEM "general.sgml">
 <!ENTITY calendar SYSTEM "calendar.sgml">
@@ -8,7 +8,7 @@
 <!ENTITY todo SYSTEM "todo.sgml">
 <!ENTITY project SYSTEM "project.sgml">
 <!ENTITY filemanager SYSTEM "filemanager.sgml">
-
+]>
 <book id="index">
 
 <bookinfo>