diff --git a/Makefile b/Makefile
index 5b0ad55..ba1a9b9 100644
--- a/Makefile
+++ b/Makefile
@@ -57,24 +57,64 @@ clean:
 	rm -rf filesystem/bin
 	rm -rf build
 #skipping doc-ion, doc-coreutils, and doc-redoxfs because they fail
-doc: doc-kernel doc-std doc-ahcid doc-e1000d doc-ps2d doc-pcid doc-vesad doc-init doc-extrautils doc-netutils doc-orbutils doc-extrautils doc-userutils doc-smith doc-ethernetd doc-example doc-ipd doc-orbital doc-tcpd doc-udpd
+doc: \
+	doc-kernel \
+	doc-std \
+	doc-ahcid \
+	doc-e1000d \
+	doc-ps2d \
+	doc-pcid \
+	doc-rtl8168d \
+	doc-vesad \
+	doc-acid \
+	doc-init \
+	doc-coreutils \
+	doc-extrautils \
+	doc-netutils \
+	doc-orbutils \
+	doc-pkgutils \
+	doc-userutils \
+	doc-smith \
+	doc-ethernetd \
+	doc-example \
+	doc-ipd \
+	doc-orbital \
+	doc-ptyd \
+	doc-randd \
+	doc-tcpd \
+	doc-udpd
 
 #FORCE to let cargo decide if docs need updating
 #all to make sure all dependencies are built
 doc-kernel: $(KBUILD)/libkernel.a all FORCE
 	$(KCARGO) doc --target $(KTARGET).json
+	mkdir -p build/doc
+	rm -rf build/doc/kernel
+	mv target/$(KTARGET)/doc build/doc/kernel
 
 doc-std: $(BUILD)/libstd.rlib all FORCE
 	$(CARGO) doc --target $(TARGET).json --manifest-path libstd/Cargo.toml
+	mkdir -p build/doc
+	rm -rf build/doc/std
+	mv libstd/target/$(TARGET)/doc build/doc/std
 
 doc-%: drivers/%/Cargo.toml all FORCE
 	$(CARGO) doc --target $(TARGET).json --manifest-path $<
+	mkdir -p build/doc
+	rm -rf build/doc/$*
+	mv drivers/$*/target/$(TARGET)/doc build/doc/$*
 
 doc-%: programs/%/Cargo.toml all FORCE
 	$(CARGO) doc --target $(TARGET).json --manifest-path $<
+	mkdir -p build/doc
+	rm -rf build/doc/$*
+	mv programs/$*/target/$(TARGET)/doc build/doc/$*
 
 doc-%: schemes/%/Cargo.toml all FORCE
 	$(CARGO) doc --target $(TARGET).json --manifest-path $<
+	mkdir -p build/doc
+	rm -rf build/doc/$*
+	mv schemes/$*/target/$(TARGET)/doc build/doc/$*
 
 update:
 	cargo update