diff --git a/Makefile b/Makefile
index ff2f8f88f..e24193c3a 100644
--- a/Makefile
+++ b/Makefile
@@ -88,55 +88,54 @@ ifdef BB_INIT_SCRIPT
     CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"'
 endif
 
-all: busybox busybox.links olddoc #doc
-
-
-# New docs based on DOCBOOK SGML
-doc: docs/BusyBox.txt docs/BusyBox.html docs/BusyBox.pdf
-
-docs/BusyBox.txt: docs/busybox.sgml
-	@echo
-	@echo BusyBox Documentation
-	@echo
-	(cd docs; sgmltools -b txt busybox.sgml)
-
-docs/BusyBox.dvi: docs/busybox.sgml
-	(cd docs; sgmltools -b dvi busybox.sgml)
-
-docs/BusyBox.ps: docs/BusyBox.dvi
-	(cd docs; sgmltools -b ps busybox.sgml)
-
-docs/BusyBox.pdf: docs/BusyBox.ps
-	(cd docs; ps2pdf busybox.ps)
-
-docs/busybox.lineo.com/BusyBox.html: docs/busybox.sgml
-	(cd docs/busybox.lineo.com; sgmltools -b html ../busybox.sgml)
-
-docs/BusyBox.html: docs/busybox.lineo.com/BusyBox.html
-	- rm -f docs/BusyBox.html
-	- ln -s busybox.lineo.com/BusyBox.html docs/BusyBox.html
+all: busybox busybox.links doc
 
+doc: olddoc
 
 # Old Docs...
-olddoc: olddoc/BusyBox.txt olddoc/BusyBox.1 olddoc/BusyBox.html
+olddoc: docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
 
-olddoc/BusyBox.txt: docs/busybox.pod
+docs/BusyBox.txt: docs/busybox.pod
 	@echo
 	@echo BusyBox Documentation
 	@echo
 	- pod2text docs/busybox.pod > docs/BusyBox.txt
 
-olddoc/BusyBox.1: docs/busybox.pod
+docs/BusyBox.1: docs/busybox.pod
 	- pod2man --center=BusyBox --release="version $(VERSION)" docs/busybox.pod > docs/BusyBox.1
 
-olddoc/BusyBox.html: olddoc/busybox.lineo.com/BusyBox.html
+docs/BusyBox.html: docs/busybox.lineo.com/BusyBox.html
 	- rm -f docs/BusyBox.html
 	- ln -s busybox.lineo.com/BusyBox.html docs/BusyBox.html
 
-olddoc/busybox.lineo.com/BusyBox.html: docs/busybox.pod
+docs/busybox.lineo.com/BusyBox.html: docs/busybox.pod
 	- pod2html --noindex docs/busybox.pod > docs/busybox.lineo.com/BusyBox.html
 	- rm -f pod2html*
 
+
+# New docs based on DOCBOOK SGML
+newdoc: docs/busybox.txt docs/busybox.pdf docs/busybox/busybox.html
+
+docs/busybox.txt: docs/busybox.sgml
+	@echo
+	@echo BusyBox Documentation
+	@echo
+	(cd docs; sgmltools -b txt busybox.sgml)
+
+docs/busybox.dvi: docs/busybox.sgml
+	(cd docs; sgmltools -b dvi busybox.sgml)
+
+docs/busybox.ps: docs/BusyBox.dvi
+	(cd docs; sgmltools -b ps busybox.sgml)
+
+docs/busybox.pdf: docs/BusyBox.ps
+	(cd docs; ps2pdf busybox.ps)
+
+docs/busybox/busybox.html: docs/busybox.sgml
+	(cd docs/busybox.lineo.com; sgmltools -b html ../busybox.sgml)
+
+
+
 busybox: $(OBJECTS)
 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
 	$(STRIP)
@@ -154,6 +153,8 @@ clean:
 	- rm -f busybox.links *~ *.o core
 	- rm -rf _install
 	- cd tests && $(MAKE) clean
+	- rm -f docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \
+	    docs/busybox.lineo.com/BusyBox.html
 	- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
 	    docs/busybox.pdf docs/busybox.lineo.com/busybox.html
 	- rm -rf docs/busybox